Move ThreadWrapper to ProcessThread in base.

webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc

 /*
  *  Copyright (c) 2015 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 "webrtc/modules/audio_processing/audio_processing_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/base/array_view.h"
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/platform_thread.h"
 #include "webrtc/config.h"
 #include "webrtc/modules/audio_processing/test/test_utils.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/system_wrappers/include/sleep.h"
-#include "webrtc/system_wrappers/include/thread_wrapper.h"
 #include "webrtc/test/random.h"
 
 namespace webrtc {
 
 namespace {
 
 class AudioProcessingImplLockTest;
 
 // Sleeps a random time between 0 and max_sleep milliseconds.
 void SleepRandomMs(int max_sleep, test::Random* rand_gen) {
@@ skipping 414 matching lines @@
     ASSERT_TRUE(capture_thread_->Start());
     capture_thread_->SetPriority(kRealtimePriority);
     ASSERT_TRUE(stats_thread_->Start());
     stats_thread_->SetPriority(kNormalPriority);
   }
 
   // Event handler for the test.
   const rtc::scoped_ptr<EventWrapper> test_complete_;
 
   // Thread related variables.
-  rtc::scoped_ptr<ThreadWrapper> render_thread_;
-  rtc::scoped_ptr<ThreadWrapper> capture_thread_;
-  rtc::scoped_ptr<ThreadWrapper> stats_thread_;
+  rtc::scoped_ptr<PlatformThread> render_thread_;
+  rtc::scoped_ptr<PlatformThread> capture_thread_;
+  rtc::scoped_ptr<PlatformThread> stats_thread_;
   mutable test::Random rand_gen_;
 
   rtc::scoped_ptr<AudioProcessing> apm_;
   TestConfig test_config_;
   FrameCounters frame_counters_;
   CaptureSideCalledChecker capture_call_checker_;
   RenderProcessor render_thread_state_;
   CaptureProcessor capture_thread_state_;
   StatsProcessor stats_thread_state_;
 };
 
 AudioProcessingImplLockTest::AudioProcessingImplLockTest()
     : test_complete_(EventWrapper::Create()),
-      render_thread_(ThreadWrapper::CreateThread(RenderProcessorThreadFunc,
+      render_thread_(PlatformThread::CreateThread(RenderProcessorThreadFunc,
+                                                  this,
+                                                  "render")),
+      capture_thread_(PlatformThread::CreateThread(CaptureProcessorThreadFunc,
+                                                   this,
+                                                   "capture")),
+      stats_thread_(PlatformThread::CreateThread(StatsProcessorThreadFunc,
                                                  this,
-                                                 "render")),
-      capture_thread_(ThreadWrapper::CreateThread(CaptureProcessorThreadFunc,
-                                                  this,
-                                                  "capture")),
-      stats_thread_(
-          ThreadWrapper::CreateThread(StatsProcessorThreadFunc, this, "stats")),
+                                                 "stats")),
       rand_gen_(42U),
       apm_(AudioProcessingImpl::Create()),
       render_thread_state_(kMaxFrameSize,
                            &rand_gen_,
                            &frame_counters_,
                            &capture_call_checker_,
                            this,
                            &test_config_,
                            apm_.get()),
       capture_thread_state_(kMaxFrameSize,
@@ skipping 616 matching lines @@
     DISABLED_AudioProcessingImplLockExtensive,
     AudioProcessingImplLockTest,
     ::testing::ValuesIn(TestConfig::GenerateExtensiveTestConfigs()));
 
 INSTANTIATE_TEST_CASE_P(
     DISABLED_AudioProcessingImplLockBrief,
     AudioProcessingImplLockTest,
     ::testing::ValuesIn(TestConfig::GenerateBriefTestConfigs()));
 
 }  // namespace webrtc