Move the device enumerate/open/close work to device thread from IO thread

content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

Index: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
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 0539bb84d2080a9eb0c725b04d81a8f0fa266147..e0ad53a74aa2064e4bf6a22cf89658469e694abb 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
@@ -17,7 +17,6 @@
 #include "content/test/test_content_browser_client.h"
 #include "content/test/test_content_client.h"
 #include "ipc/ipc_message_macros.h"
-#include "media/audio/audio_manager.h"
 #include "net/url_request/url_request_context.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -40,9 +39,8 @@ class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost,
                                       public content::TestContentBrowserClient {
  public:
   MockMediaStreamDispatcherHost(content::ResourceContext* resource_context,
-                                MessageLoop* message_loop,
-                                media::AudioManager* audio_manager)
-      : MediaStreamDispatcherHost(resource_context, kProcessId, audio_manager),
+                                MessageLoop* message_loop)
+      : MediaStreamDispatcherHost(resource_context, kProcessId),
         message_loop_(message_loop) {}
 
   // A list of mock methods.
@@ -162,17 +160,15 @@ class MediaStreamDispatcherHostTest : public testing::Test {
     io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
                                            message_loop_.get()));
 
-    audio_manager_.reset(media::AudioManager::Create());
-
     // Create our own media observer.
     media_observer_.reset(new MockMediaObserver());
 
     // Make sure we use fake devices to avoid long delays.
     MediaStreamManager::GetForResourceContext(
-        &resource_context_, audio_manager_.get())->UseFakeDevice();
+        &resource_context_)->UseFakeDevice();
 
-    host_ = new MockMediaStreamDispatcherHost(
-        &resource_context_, message_loop_.get(), audio_manager_.get());
+    host_ = new MockMediaStreamDispatcherHost(&resource_context_,
+                                              message_loop_.get());
 
     // Use the fake content client and browser.
     old_client_ = content::GetContentClient();
@@ -201,9 +197,8 @@ class MediaStreamDispatcherHostTest : public testing::Test {
   static void PostQuitOnVideoCaptureManagerThread(
       MessageLoop* message_loop,
       media_stream::MediaStreamManager* media_stream_manager) {
-    media_stream_manager->video_capture_manager()->GetMessageLoop()->
-        PostTask(FROM_HERE,
-                 base::Bind(&PostQuitMessageLoop, message_loop));
+    media_stream_manager->GetMessageLoop()->PostTask(
+        FROM_HERE, base::Bind(&PostQuitMessageLoop, message_loop));
   }
 
   // SyncWithVideoCaptureManagerThread() waits until all pending tasks on the
@@ -217,7 +212,7 @@ class MediaStreamDispatcherHostTest : public testing::Test {
         base::Bind(&PostQuitOnVideoCaptureManagerThread,
                    message_loop_.get(),
                    MediaStreamManager::GetForResourceContext(
-                       &resource_context_, audio_manager_.get())));
+                       &resource_context_)));
     message_loop_->Run();
   }
 
@@ -225,7 +220,6 @@ class MediaStreamDispatcherHostTest : public testing::Test {
   scoped_ptr<MessageLoop> message_loop_;
   scoped_ptr<BrowserThreadImpl> ui_thread_;
   scoped_ptr<BrowserThreadImpl> io_thread_;
-  scoped_ptr<media::AudioManager> audio_manager_;
   content::MockResourceContext resource_context_;
   content::ContentClient* old_client_;
   content::ContentBrowserClient* old_browser_client_;
@@ -346,8 +340,7 @@ TEST_F(MediaStreamDispatcherHostTest, FailDevice) {
 
   EXPECT_CALL(*host_, OnVideoDeviceFailed(kRenderId, 0));
   int session_id = host_->video_devices_[0].session_id;
-  MediaStreamManager::GetForResourceContext(
-      &resource_context_, audio_manager_.get())->
+  MediaStreamManager::GetForResourceContext(&resource_context_)->
           video_capture_manager()->Error(session_id);

[scherkus (not reviewing), 2012/06/27 00:52:31]

fix indent

[no longer working on chromium, 2012/06/27 14:07:16]

Done.

   WaitForResult();
   EXPECT_EQ(host_->video_devices_.size(), 0u);