Clean up PlatformThread.

webrtc/system_wrappers/source/condition_variable_unittest.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 126 matching lines @@
 // We expect these calls never to time out.
 bool WaitingRunFunction(void* obj) {
   Baton* the_baton = static_cast<Baton*> (obj);
   EXPECT_TRUE(the_baton->Grab(kLongWaitMs));
   EXPECT_TRUE(the_baton->Pass(kLongWaitMs));
   return true;
 }
 
 class CondVarTest : public ::testing::Test {
  public:
-  CondVarTest() {}
+  CondVarTest() : thread_(&WaitingRunFunction, &baton_, "CondVarTest") {}
 
   virtual void SetUp() {
-    thread_ = PlatformThread::CreateThread(&WaitingRunFunction, &baton_,
-                                           "CondVarTest");
-    ASSERT_TRUE(thread_->Start());
+    thread_.Start();
   }
 
   virtual void TearDown() {
     // We have to wake the thread in order to make it obey the stop order.
     // But we don't know if the thread has completed the run function, so
     // we don't know if it will exit before or after the Pass.
     // Thus, we need to pin it down inside its Run function (between Grab
     // and Pass).
     ASSERT_TRUE(baton_.Pass(kShortWaitMs));
     ASSERT_TRUE(baton_.Grab(kShortWaitMs));
-    ASSERT_TRUE(thread_->Stop());
+    thread_.Stop();
   }
 
  protected:
   Baton baton_;
 
  private:
-  rtc::scoped_ptr<PlatformThread> thread_;
+  rtc::PlatformThread thread_;
 };
 
 // The SetUp and TearDown functions use condition variables.
 // This test verifies those pieces in isolation.
 // Disabled due to flakiness.  See bug 4262 for details.
 TEST_F(CondVarTest, DISABLED_InitFunctionsWork) {
   // All relevant asserts are in the SetUp and TearDown functions.
 }
 
 // This test verifies that one can use the baton multiple times.
@@ skipping 15 matching lines @@
   int64_t start_ms = TickTime::MillisecondTimestamp();
   EXPECT_FALSE(cond_var->SleepCS(*(crit_sect), kVeryShortWaitMs));
   int64_t end_ms = TickTime::MillisecondTimestamp();
   EXPECT_LE(start_ms + kVeryShortWaitMs, end_ms)
       << "actual elapsed:" << end_ms - start_ms;
 }
 
 }  // anonymous namespace
 
 }  // namespace webrtc