Index: media/video/capture/video_capture_device_factory.cc |
=================================================================== |
--- media/video/capture/video_capture_device_factory.cc (revision 269380) |
+++ media/video/capture/video_capture_device_factory.cc (working copy) |
@@ -4,48 +4,12 @@ |
#include "media/video/capture/video_capture_device_factory.h" |
-#include "base/command_line.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" |
- |
-#if defined(OS_MACOSX) |
-#include "media/video/capture/mac/video_capture_device_factory_mac.h" |
-#endif |
- |
namespace media { |
-// static |
-scoped_ptr<VideoCaptureDeviceFactory> |
- VideoCaptureDeviceFactory::CreateFactory() { |
- const CommandLine* command_line = CommandLine::ForCurrentProcess(); |
- // Use a Fake or File Video Device Factory if the command line flags are |
- // present, otherwise use the normal, platform-dependent, device factory. |
- if (command_line->HasSwitch(switches::kUseFakeDeviceForMediaStream)) { |
- if (command_line->HasSwitch(switches::kUseFileForFakeVideoCapture)) { |
- return scoped_ptr<VideoCaptureDeviceFactory>(new |
- media::FileVideoCaptureDeviceFactory()); |
- } else { |
- return scoped_ptr<VideoCaptureDeviceFactory>(new |
- media::FakeVideoCaptureDeviceFactory()); |
- } |
- } else { |
-#if defined(OS_MACOSX) |
- return scoped_ptr<VideoCaptureDeviceFactory>(new |
- VideoCaptureDeviceFactoryMac()); |
-#else |
- return scoped_ptr<VideoCaptureDeviceFactory>(new |
- VideoCaptureDeviceFactory()); |
-#endif |
- } |
-} |
- |
VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { |
thread_checker_.DetachFromThread(); |
-} |
+}; |
-VideoCaptureDeviceFactory::~VideoCaptureDeviceFactory() {} |
- |
scoped_ptr<VideoCaptureDevice> VideoCaptureDeviceFactory::Create( |
const VideoCaptureDevice::Name& device_name) { |
DCHECK(thread_checker_.CalledOnValidThread()); |