Switch content tests to use BrowserThreadImpl directly.

BUG=98716


Review URL: http://codereview.chromium.org/8400060

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107964 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 39 insertions, 29 deletions

diff --git a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
index dd6d303..7813706 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
+++ b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
@@ -7,9 +7,9 @@
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
+#include "content/browser/browser_thread_impl.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager_event_handler.h"
-#include "content/test/test_browser_thread.h"
 #include "media/audio/audio_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -19,6 +19,8 @@ using ::testing::AnyNumber;
 using ::testing::InSequence;
 using ::testing::Return;
 
+using content::BrowserThreadImpl;
+
 namespace media_stream {
 
 class MockAudioInputDeviceManagerListener
@@ -85,8 +87,8 @@ class AudioInputDeviceManagerTest: public testing::Test {
   virtual void SetUp() {
     // The test must run on Browser::IO.
     message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
-    io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO,
-                                                    message_loop_.get()));
+    io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
+                                           message_loop_.get()));
     manager_.reset(new media_stream::AudioInputDeviceManager());
     audio_input_listener_.reset(new MockAudioInputDeviceManagerListener());
     manager_->Register(audio_input_listener_.get());
@@ -128,7 +130,7 @@ class AudioInputDeviceManagerTest: public testing::Test {
     message_loop_->Run();
   }
   scoped_ptr<MessageLoop> message_loop_;
-  scoped_ptr<content::TestBrowserThread> io_thread_;
+  scoped_ptr<BrowserThreadImpl> io_thread_;
   scoped_ptr<AudioInputDeviceManager> manager_;
   scoped_ptr<MockAudioInputDeviceManagerListener> audio_input_listener_;
 
diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index 36b29e2..5b625a8 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -8,11 +8,11 @@
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/sync_socket.h"
+#include "content/browser/browser_thread_impl.h"
 #include "content/browser/mock_resource_context.h"
 #include "content/browser/renderer_host/media/audio_renderer_host.h"
 #include "content/browser/renderer_host/media/mock_media_observer.h"
 #include "content/common/media/audio_messages.h"
-#include "content/test/test_browser_thread.h"
 #include "ipc/ipc_message_utils.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/fake_audio_output_stream.h"
@@ -28,6 +28,8 @@ using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::SetArgumentPointee;
 
+using content::BrowserThreadImpl;
+
 static const int kStreamId = 50;
 
 static bool IsRunningHeadless() {
@@ -175,10 +177,10 @@ class AudioRendererHostTest : public testing::Test {
     message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
 
     // Claim to be on both the UI and IO threads to pass all the DCHECKS.
-    io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO,
-                                                    message_loop_.get()));
-    ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI,
-                                                    message_loop_.get()));
+    io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
+                                           message_loop_.get()));
+    ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI,
+                                           message_loop_.get()));
 
     observer_.reset(new MockMediaObserver());
     content::MockResourceContext* context =
@@ -359,8 +361,8 @@ class AudioRendererHostTest : public testing::Test {
   scoped_ptr<MockMediaObserver> observer_;
   scoped_refptr<MockAudioRendererHost> host_;
   scoped_ptr<MessageLoop> message_loop_;
-  scoped_ptr<content::TestBrowserThread> io_thread_;
-  scoped_ptr<content::TestBrowserThread> ui_thread_;
+  scoped_ptr<BrowserThreadImpl> io_thread_;
+  scoped_ptr<BrowserThreadImpl> ui_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererHostTest);
 };
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
index a9afcee..a0d5f0e 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "base/message_loop.h"
+#include "content/browser/browser_thread_impl.h"
 #include "content/browser/mock_resource_context.h"
 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
@@ -13,7 +14,6 @@
 #include "content/browser/resource_context.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
-#include "content/test/test_browser_thread.h"
 #include "ipc/ipc_message_macros.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -23,6 +23,8 @@ using ::testing::DeleteArg;
 using ::testing::DoAll;
 using ::testing::Return;
 
+using content::BrowserThreadImpl;
+
 const int kProcessId = 5;
 const int kRenderId = 6;
 const int kPageRequestId = 7;
@@ -142,11 +144,11 @@ class MediaStreamDispatcherHostTest : public testing::Test {
   virtual void SetUp() {
     message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
     // ResourceContext must be created on UI thread.
-    ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI,
-                                                    message_loop_.get()));
+    ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI,
+                                           message_loop_.get()));
     // MediaStreamManager must be created and called on IO thread.
-    io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO,
-                                                    message_loop_.get()));
+    io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
+                                           message_loop_.get()));
 
     // Create a MediaStreamManager instance and hand over pointer to
     // ResourceContext.
@@ -196,8 +198,8 @@ class MediaStreamDispatcherHostTest : public testing::Test {
 
   scoped_refptr<MockMediaStreamDispatcherHost> host_;
   scoped_ptr<MessageLoop> message_loop_;
-  scoped_ptr<content::TestBrowserThread> ui_thread_;
-  scoped_ptr<content::TestBrowserThread> io_thread_;
+  scoped_ptr<BrowserThreadImpl> ui_thread_;
+  scoped_ptr<BrowserThreadImpl> io_thread_;
   scoped_ptr<MediaStreamManager> media_stream_manager_;
 };
 
diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc
index 3bf4de0..ffaa8322 100644
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
@@ -12,13 +12,13 @@
 #include "base/process_util.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
+#include "content/browser/browser_thread_impl.h"
 #include "content/browser/mock_resource_context.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/video_capture_host.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/browser/resource_context.h"
 #include "content/common/media/video_capture_messages.h"
-#include "content/test/test_browser_thread.h"
 #include "media/video/capture/video_capture_types.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
@@ -32,6 +32,8 @@ using ::testing::InSequence;
 using ::testing::Mock;
 using ::testing::Return;
 
+using content::BrowserThreadImpl;
+
 // Id used to identify the capture session between renderer and
 // video_capture_host.
 static const int kDeviceId = 1;
@@ -195,12 +197,12 @@ class VideoCaptureHostTest : public testing::Test {
     message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
 
     // ResourceContext must be created on the UI thread.
-    ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI,
-                                                    message_loop_.get()));
+    ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI,
+                                           message_loop_.get()));
 
     // MediaStreamManager must be created on the IO thread.
-    io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO,
-                                                    message_loop_.get()));
+    io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
+                                           message_loop_.get()));
 
     // Create a MediaStreamManager instance and hand over pointer to
     // ResourceContext.
@@ -362,8 +364,8 @@ class VideoCaptureHostTest : public testing::Test {
 
  private:
   scoped_ptr<MessageLoop> message_loop_;
-  scoped_ptr<content::TestBrowserThread> ui_thread_;
-  scoped_ptr<content::TestBrowserThread> io_thread_;
+  scoped_ptr<BrowserThreadImpl> ui_thread_;
+  scoped_ptr<BrowserThreadImpl> io_thread_;
   scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureHostTest);
diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
index 1ec4991..db2510e 100644
--- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
@@ -10,10 +10,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
+#include "content/browser/browser_thread_impl.h"
 #include "content/browser/renderer_host/media/media_stream_provider.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/common/media/media_stream_options.h"
-#include "content/test/test_browser_thread.h"
 #include "media/video/capture/video_capture_device.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -23,6 +23,8 @@ using ::testing::AnyNumber;
 using ::testing::InSequence;
 using ::testing::Return;
 
+using content::BrowserThreadImpl;
+
 namespace media_stream {
 
 // Listener class used to track progress of VideoCaptureManager test
@@ -82,8 +84,8 @@ class VideoCaptureManagerTest : public testing::Test {
   virtual void SetUp() {
     listener_.reset(new media_stream::MockMediaStreamProviderListener());
     message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
-    io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO,
-                                                    message_loop_.get()));
+    io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
+                                           message_loop_.get()));
     vcm_.reset(new media_stream::VideoCaptureManager());
     vcm_->UseFakeDevice();
     vcm_->Register(listener_.get());
@@ -121,7 +123,7 @@ class VideoCaptureManagerTest : public testing::Test {
   scoped_ptr<media_stream::VideoCaptureManager> vcm_;
   scoped_ptr<media_stream::MockMediaStreamProviderListener> listener_;
   scoped_ptr<MessageLoop> message_loop_;
-  scoped_ptr<content::TestBrowserThread> io_thread_;
+  scoped_ptr<BrowserThreadImpl> io_thread_;
   scoped_ptr<MockFrameObserver> frame_observer_;
 
  private: