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 af543fc26d562756c7c3a4a2aa2e42cfd572ab9f..b29e4c5b610d5917fb4263a6af7c6b1a2b54a6cb 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)
@@ -1427,19 +1430,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(
+                      switches::kUseFileForFakeVideoCapture)) {

[perkj_chrome, 2014/04/17 08:39:09]

indentation

[mcasas, 2014/04/23 06:20:28]

Done.

+      video_capture_manager_ = new VideoCaptureManager(
+          scoped_ptr<media::VideoCaptureDeviceFactory>(

[perkj_chrome, 2014/04/17 08:39:09]

why not just take a pointer to the factory?

[mcasas, 2014/04/23 06:20:28]

The rest of MSM expects a scoped_ptr(), and is used for Register()/Unregister()
etc.

+              new media::FileVideoCaptureDeviceFactory()));
+    } else {
+      video_capture_manager_ = new VideoCaptureManager(
+          scoped_ptr<media::VideoCaptureDeviceFactory>(
+              new media::FakeVideoCaptureDeviceFactory()));
+    }
+    UseFakeAudioDevice();
+  } else {
+      video_capture_manager_ = new VideoCaptureManager(
+      scoped_ptr<media::VideoCaptureDeviceFactory>(
+          new media::VideoCaptureDeviceFactory()));
   }
+  video_capture_manager_->Register(this, device_task_runner_);
 }
 
 void MediaStreamManager::Opened(MediaStreamType stream_type,
@@ -1791,9 +1807,14 @@ void MediaStreamManager::StopMediaStreamFromBrowser(const std::string& label) {
   CancelRequest(label);
 }
 
-void MediaStreamManager::UseFakeDevice() {
+void MediaStreamManager::UseFakeVideoDevice(

[perkj_chrome, 2014/04/17 08:39:09]

I think you should delete this method and in the unit test use
CommandLine::ForCurrentProcess()->AppendSwitch(
      switches::::kUseFakeDeviceForMediaStream);

See for ex MediaStreamAudioProcessorTest.

[mcasas, 2014/04/23 06:20:28]

Ok, I was actually undecided between the switch option
and the method. Both are ugly 'cause the are means to
control the internal behaviour of VCM from outside, but
I guess the flag is marginally less ugly.

+    scoped_ptr<media::VideoCaptureDeviceFactory> factory) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  video_capture_manager()->UseFakeDevice(factory.Pass());
+}
+
+void MediaStreamManager::UseFakeAudioDevice() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  video_capture_manager()->UseFakeDevice();
   audio_input_device_manager()->UseFakeDevice();

[perkj_chrome, 2014/04/17 08:39:09]

Actually - use the switch for this as well and remove the method. The question
is just if you should do it in this file on line 1435 or
theaudio_input_device_manager

[mcasas, 2014/04/23 06:20:28]

Done in InitializeDeviceManagersOnIOThread().

 }