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

content/browser/renderer_host/media/video_capture_host_unittest.cc

Index: content/browser/renderer_host/media/video_capture_host_unittest.cc
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 f7f31e66f2b251fd1d6d785c1e853eda91f2e6e1..083b3f9c595c5d9b3535de8f00b85c23b3c2d969 100644
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
@@ -18,7 +18,6 @@
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/common/media/video_capture_messages.h"
 #include "content/public/test/mock_resource_context.h"
-#include "media/audio/audio_manager.h"
 #include "media/video/capture/video_capture_types.h"
 #include "net/url_request/url_request_context.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -71,9 +70,8 @@ class DumpVideo {
 
 class MockVideoCaptureHost : public VideoCaptureHost {
  public:
-  MockVideoCaptureHost(content::ResourceContext* resource_context,
-                       media::AudioManager* audio_manager)
-      : VideoCaptureHost(resource_context, audio_manager),
+  MockVideoCaptureHost(content::ResourceContext* resource_context)
+      : VideoCaptureHost(resource_context),
         return_buffers_(false),
         dump_video_(false) {}
 
@@ -208,14 +206,12 @@ class VideoCaptureHostTest : public testing::Test {
     io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
                                            message_loop_.get()));
 
-    audio_manager_.reset(media::AudioManager::Create());
-
 #ifndef TEST_REAL_CAPTURE_DEVICE
     media_stream::MediaStreamManager::GetForResourceContext(
-        &resource_context_, audio_manager_.get())->UseFakeDevice();
+        &resource_context_)->UseFakeDevice();
 #endif
 
-    host_ = new MockVideoCaptureHost(&resource_context_, audio_manager_.get());
+    host_ = new MockVideoCaptureHost(&resource_context_);
 
     // Simulate IPC channel connected.
     host_->OnChannelConnected(base::GetCurrentProcId());
@@ -248,12 +244,11 @@ class VideoCaptureHostTest : public testing::Test {
 
   // Called on the main thread.
   static void PostQuitOnVideoCaptureManagerThread(
-      MessageLoop* message_loop, content::ResourceContext* resource_context,
-      media:: AudioManager* audio_manager) {
+      MessageLoop* message_loop, content::ResourceContext* resource_context) {
     media_stream::MediaStreamManager* manager =
         media_stream::MediaStreamManager::GetForResourceContext(
-            resource_context, audio_manager);
-    manager->video_capture_manager()->GetMessageLoop()->PostTask(
+            resource_context);
+    manager->GetMessageLoop()->PostTask(
         FROM_HERE, base::Bind(&PostQuitMessageLoop, message_loop));
   }
 
@@ -266,7 +261,7 @@ class VideoCaptureHostTest : public testing::Test {
     message_loop_->PostTask(
         FROM_HERE,
         base::Bind(&PostQuitOnVideoCaptureManagerThread, message_loop_.get(),
-                   &resource_context_, audio_manager_.get()));
+                   &resource_context_));
     message_loop_->Run();
   }
 
@@ -365,7 +360,6 @@ class VideoCaptureHostTest : 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_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureHostTest);