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

content/browser/renderer_host/media/media_stream_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 
 #include <list>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 18 matching lines @@
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/media_device_id.h"
 #include "content/public/browser/media_observer.h"
 #include "content/public/browser/media_request_state.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/media_stream_request.h"
 #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)
 #include "base/win/scoped_com_initializer.h"
 #endif
 
 namespace content {
 
 // Forward declaration of DeviceMonitorMac and its only useable method.
 class DeviceMonitorMac {
@@ skipping 1371 matching lines @@
 void MediaStreamManager::InitializeDeviceManagersOnIOThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (device_task_runner_)
     return;
 
   device_task_runner_ = audio_manager_->GetWorkerTaskRunner();
 
   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,
                                 int capture_session_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DVLOG(1) << "Opened({stream_type = " << stream_type <<  "} "
            << "{capture_session_id = " << capture_session_id << "})";
   // Find the request(s) containing this device and mark it as used.
   // It can be used in several requests since the same device can be
   // requested from the same web page.
@@ skipping 331 matching lines @@
          device_it != request->devices.end(); ++device_it) {
       request->requester->DeviceStopped(request->requesting_view_id,
                                         label,
                                         *device_it);
     }
   }
 
   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();
+  video_capture_manager()->UseFakeDevice(factory.Pass());
+}
+
+void MediaStreamManager::UseFakeAudioDevice() {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   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().

 }
 
 void MediaStreamManager::UseFakeUI(scoped_ptr<FakeMediaStreamUIProxy> fake_ui) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   use_fake_ui_ = true;
   fake_ui_ = fake_ui.Pass();
 }
 
 void MediaStreamManager::WillDestroyCurrentMessageLoop() {
   DVLOG(3) << "MediaStreamManager::WillDestroyCurrentMessageLoop()";
@@ skipping 112 matching lines @@
       if (it->device.type == MEDIA_DESKTOP_VIDEO_CAPTURE) {
         video_capture_manager_->SetDesktopCaptureWindowId(it->session_id,
                                                           window_id);
         break;
       }
     }
   }
 }
 
 }  // namespace content