Revert of Delete class ScopedPtrCollection. Replaced with vector of unique_ptr.

webrtc/base/criticalsection_unittest.cc

 /*
  *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/event.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/platform_thread.h"
+#include "webrtc/base/scopedptrcollection.h"
 #include "webrtc/base/thread.h"
 
 namespace rtc {
 
 namespace {
 
 const int kLongTime = 10000;  // 10 seconds
 const int kNumThreads = 16;
 const int kOperationsToRun = 1000;
 
@@ skipping 160 matching lines @@
 };
 
 struct DecrementOp {
   static int AtomicOp(int* i) { return AtomicOps::Decrement(i); }
 };
 
 struct CompareAndSwapOp {
   static int AtomicOp(int* i) { return AtomicOps::CompareAndSwap(i, 0, 1); }
 };
 
-void StartThreads(std::vector<std::unique_ptr<Thread>>* threads,
+void StartThreads(ScopedPtrCollection<Thread>* threads,
                   MessageHandler* handler) {
   for (int i = 0; i < kNumThreads; ++i) {
-    std::unique_ptr<Thread> thread(new Thread());
+    Thread* thread = new Thread();
     thread->Start();
     thread->Post(RTC_FROM_HERE, handler);
-    threads->push_back(std::move(thread));
+    threads->PushBack(thread);
   }
 }
 
 }  // namespace
 
 TEST(AtomicOpsTest, Simple) {
   int value = 0;
   EXPECT_EQ(1, AtomicOps::Increment(&value));
   EXPECT_EQ(1, value);
   EXPECT_EQ(2, AtomicOps::Increment(&value));
@@ skipping 22 matching lines @@
   EXPECT_TRUE(rtc::AtomicOps::AcquireLoadPtr(&foo) == a.get());
   // Replacing a with b should work.
   EXPECT_TRUE(rtc::AtomicOps::CompareAndSwapPtr(&foo, a.get(), b.get()) ==
               a.get());
   EXPECT_TRUE(rtc::AtomicOps::AcquireLoadPtr(&foo) == b.get());
 }
 
 TEST(AtomicOpsTest, Increment) {
   // Create and start lots of threads.
   AtomicOpRunner<IncrementOp, UniqueValueVerifier> runner(0);
-  std::vector<std::unique_ptr<Thread>> threads;
+  ScopedPtrCollection<Thread> threads;
   StartThreads(&threads, &runner);
   runner.SetExpectedThreadCount(kNumThreads);
 
   // Release the hounds!
   EXPECT_TRUE(runner.Run());
   EXPECT_EQ(kOperationsToRun * kNumThreads, runner.shared_value());
 }
 
 TEST(AtomicOpsTest, Decrement) {
   // Create and start lots of threads.
   AtomicOpRunner<DecrementOp, UniqueValueVerifier> runner(
       kOperationsToRun * kNumThreads);
-  std::vector<std::unique_ptr<Thread>> threads;
+  ScopedPtrCollection<Thread> threads;
   StartThreads(&threads, &runner);
   runner.SetExpectedThreadCount(kNumThreads);
 
   // Release the hounds!
   EXPECT_TRUE(runner.Run());
   EXPECT_EQ(0, runner.shared_value());
 }
 
 TEST(AtomicOpsTest, CompareAndSwap) {
   // Create and start lots of threads.
   AtomicOpRunner<CompareAndSwapOp, CompareAndSwapVerifier> runner(0);
-  std::vector<std::unique_ptr<Thread>> threads;
+  ScopedPtrCollection<Thread> threads;
   StartThreads(&threads, &runner);
   runner.SetExpectedThreadCount(kNumThreads);
 
   // Release the hounds!
   EXPECT_TRUE(runner.Run());
   EXPECT_EQ(1, runner.shared_value());
 }
 
 TEST(GlobalLockTest, Basic) {
   // Create and start lots of threads.
   LockRunner<GlobalLock> runner;
-  std::vector<std::unique_ptr<Thread>> threads;
+  ScopedPtrCollection<Thread> threads;
   StartThreads(&threads, &runner);
   runner.SetExpectedThreadCount(kNumThreads);
 
   // Release the hounds!
   EXPECT_TRUE(runner.Run());
   EXPECT_EQ(0, runner.shared_value());
 }
 
 TEST(CriticalSectionTest, Basic) {
   // Create and start lots of threads.
   LockRunner<CriticalSectionLock> runner;
-  std::vector<std::unique_ptr<Thread>> threads;
+  ScopedPtrCollection<Thread> threads;
   StartThreads(&threads, &runner);
   runner.SetExpectedThreadCount(kNumThreads);
 
   // Release the hounds!
   EXPECT_TRUE(runner.Run());
   EXPECT_EQ(0, runner.shared_value());
 }
 
 class PerfTestData {
  public:
@@ skipping 94 matching lines @@
   for (auto& t : threads)
     t.Start(&test_data, kThreadRepeats, 1);
 
   event.Wait(Event::kForever);
 
   for (auto& t : threads)
     t.Stop();
 }
 
 }  // namespace rtc