| Index: media/video/capture/mac/video_capture_device_mac.mm
|
| diff --git a/media/video/capture/mac/video_capture_device_mac.mm b/media/video/capture/mac/video_capture_device_mac.mm
|
| index 3ad0d45c2819e9e6ea153a97f55acd3a815f2391..60278b761571c920e529bf4551e005a5d584794d 100644
|
| --- a/media/video/capture/mac/video_capture_device_mac.mm
|
| +++ b/media/video/capture/mac/video_capture_device_mac.mm
|
| @@ -306,30 +306,6 @@ static void SetAntiFlickerInUsbDevice(const int vendor_id,
|
| }
|
| }
|
|
|
| -// TODO(mcasas): Remove the following static methods when they are no longer
|
| -// referenced from VideoCaptureDeviceFactory, i.e. when all OS platforms have
|
| -// splitted the VideoCaptureDevice into VideoCaptureDevice and
|
| -// VideoCaptureDeviceFactory.
|
| -
|
| -// static
|
| -VideoCaptureDevice* VideoCaptureDevice::Create(
|
| - scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
|
| - const Name& device_name) {
|
| - NOTREACHED();
|
| - return NULL;
|
| -}
|
| -// static
|
| -void VideoCaptureDevice::GetDeviceNames(Names* device_names) {
|
| - NOTREACHED();
|
| -}
|
| -
|
| -// static
|
| -void VideoCaptureDevice::GetDeviceSupportedFormats(
|
| - const Name& device,
|
| - VideoCaptureFormats* supported_formats) {
|
| - NOTREACHED();
|
| -}
|
| -
|
| const std::string VideoCaptureDevice::Name::GetModel() const {
|
| // Both PID and VID are 4 characters.
|
| if (unique_id_.size() < 2 * kVidPidSize) {
|
|
|