Extract VideoCaptureDeviceFactory out of VideoCaptureDevice and use for File and FakeVCD.

content/browser/renderer_host/media/media_stream_manager.cc

Index: content/browser/renderer_host/media/media_stream_manager.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index 944ece580fa5620c5e01e865295840da7567814d..e7c073ab3984259220808c763091b5d8ae9efb2f 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -36,6 +36,9 @@
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/channel_layout.h"
+#include "media/base/media_switches.h"
+#include "media/video/capture/fake_video_capture_device_factory.h"
+#include "media/video/capture/file_video_capture_device_factory.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
@@ -1430,19 +1433,32 @@ void MediaStreamManager::InitializeDeviceManagersOnIOThread() {
   audio_input_device_manager_ = new AudioInputDeviceManager(audio_manager_);
   audio_input_device_manager_->Register(this, device_task_runner_);
 
-  video_capture_manager_ = new VideoCaptureManager();
-  video_capture_manager_->Register(this, device_task_runner_);
-
   // We want to be notified of IO message loop destruction to delete the thread
   // and the device managers.
   io_loop_ = base::MessageLoop::current();
   io_loop_->AddDestructionObserver(this);
 
+  // Use a Fake Audio Device and Fake/File Video Device Factory if the command
+  // line flags are present, otherwise use a normal device factory.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseFakeDeviceForMediaStream)) {
-    DVLOG(1) << "Using fake device";
-    UseFakeDevice();
+    if (CommandLine::ForCurrentProcess()->HasSwitch(

[perkj_chrome, 2014/04/24 14:43:32]

So to use kUseFileForFakeVideoCapture you also have to use
kUseFakeDeviceForMediaStream ? Is that intententional?

[mcasas, 2014/04/24 20:20:26]

Yes, it was indicated by fischman@.

+            switches::kUseFileForFakeVideoCapture)) {
+      video_capture_manager_ = new VideoCaptureManager(
+          scoped_ptr<media::VideoCaptureDeviceFactory>(
+              new media::FileVideoCaptureDeviceFactory()));
+    } else {
+      video_capture_manager_ = new VideoCaptureManager(
+          scoped_ptr<media::VideoCaptureDeviceFactory>(
+              new media::FakeVideoCaptureDeviceFactory()));
+    }
+    audio_input_device_manager()->UseFakeDevice();
+  } else {
+      video_capture_manager_ = new VideoCaptureManager(
+      scoped_ptr<media::VideoCaptureDeviceFactory>(

[perkj_chrome, 2014/04/24 14:43:32]

nit:indentation

[mcasas, 2014/04/24 20:20:26]

Done.

+          new media::VideoCaptureDeviceFactory()));
   }
+  video_capture_manager_->Register(this, device_task_runner_);
 }
 
 void MediaStreamManager::Opened(MediaStreamType stream_type,
@@ -1794,12 +1810,6 @@ void MediaStreamManager::StopMediaStreamFromBrowser(const std::string& label) {
   CancelRequest(label);
 }
 
-void MediaStreamManager::UseFakeDevice() {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  video_capture_manager()->UseFakeDevice();
-  audio_input_device_manager()->UseFakeDevice();
-}
-
 void MediaStreamManager::UseFakeUI(scoped_ptr<FakeMediaStreamUIProxy> fake_ui) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   use_fake_ui_ = true;