Mac Video Capture Device: split VCD into VCD and Factory.

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 21 matching lines @@
 #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 "media/video/capture/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 1381 matching lines @@
   audio_input_device_manager_ = new AudioInputDeviceManager(audio_manager_);
   audio_input_device_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(

[perkj_chrome, 2014/05/06 06:44:46]

You can move this too into your Create method.- ie, Create decide what factory
to use, including the fakes.

[mcasas, 2014/05/06 07:26:30]

Great idea. Done so, and with it I moved the flag
|kUseFakeDeviceForMediaStream| into media_switches --
note that this flag is still used in MediaStreamManager for 
the Fake Audio parts.

           switches::kUseFakeDeviceForMediaStream)) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             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>(
-            new media::VideoCaptureDeviceFactory()));
+    scoped_ptr<media::VideoCaptureDeviceFactory> video_capture_device_factory =
+        media::VideoCaptureDeviceFactory::Create();
+    video_capture_manager_ = new
+        VideoCaptureManager(video_capture_device_factory.Pass());
   }
   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.
@@ skipping 471 matching lines @@
       if (it->device.type == MEDIA_DESKTOP_VIDEO_CAPTURE) {
         video_capture_manager_->SetDesktopCaptureWindowId(it->session_id,
                                                           window_id);
         break;
       }
     }
   }
 }
 
 }  // namespace content