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

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 3cdb1abffd3cddfffe648d9c74711eb1c7b8f0ae..fe537d9751a7e439b15497e1b913c7449a45a907 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -37,8 +37,7 @@
 #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)
@@ -1438,26 +1437,13 @@ void MediaStreamManager::InitializeDeviceManagersOnIOThread() {
   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)) {
-    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()));
-    }
+      switches::kUseFakeDeviceForMediaStream)) {
     audio_input_device_manager()->UseFakeDevice();
-  } else {
-    video_capture_manager_ = new VideoCaptureManager(
-        scoped_ptr<media::VideoCaptureDeviceFactory>(
-            new media::VideoCaptureDeviceFactory()));
   }
+
+  video_capture_manager_ = new VideoCaptureManager(
+      media::VideoCaptureDeviceFactory::CreateFactory());
   video_capture_manager_->Register(this, device_task_runner_);
 }