| Index: content/renderer/pepper/pepper_platform_camera_device.cc
|
| diff --git a/content/renderer/pepper/pepper_platform_camera_device.cc b/content/renderer/pepper/pepper_platform_camera_device.cc
|
| index c3dfff222a6c634d9f526b2006dc8825f1d0eaaa..572e3c9e4a88fb656356b6ba8747f21e87352008 100644
|
| --- a/content/renderer/pepper/pepper_platform_camera_device.cc
|
| +++ b/content/renderer/pepper/pepper_platform_camera_device.cc
|
| @@ -8,7 +8,7 @@
|
| #include "base/callback_helpers.h"
|
| #include "base/logging.h"
|
| #include "base/message_loop/message_loop_proxy.h"
|
| -#include "content/renderer/media/video_capture_impl_manager.h"
|
| +#include "content/renderer/media/video_capture_service.h"
|
| #include "content/renderer/pepper/gfx_conversion.h"
|
| #include "content/renderer/pepper/pepper_camera_device_host.h"
|
| #include "content/renderer/pepper/pepper_media_device_manager.h"
|
| @@ -45,8 +45,8 @@ PepperPlatformCameraDevice::PepperPlatformCameraDevice(
|
|
|
| void PepperPlatformCameraDevice::GetSupportedVideoCaptureFormats() {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - VideoCaptureImplManager* manager =
|
| - RenderThreadImpl::current()->video_capture_impl_manager();
|
| + VideoCaptureService* manager =
|
| + RenderThreadImpl::current()->video_capture_service();
|
| manager->GetDeviceSupportedFormats(
|
| session_id_,
|
| media::BindToCurrentLoop(base::Bind(
|
| @@ -97,8 +97,8 @@ void PepperPlatformCameraDevice::OnDeviceOpened(int request_id,
|
| label_ = label;
|
| session_id_ =
|
| device_manager->GetSessionID(PP_DEVICETYPE_DEV_VIDEOCAPTURE, label);
|
| - VideoCaptureImplManager* manager =
|
| - RenderThreadImpl::current()->video_capture_impl_manager();
|
| + VideoCaptureService* manager =
|
| + RenderThreadImpl::current()->video_capture_service();
|
| release_device_cb_ = manager->UseDevice(session_id_);
|
| }
|
|
|
|
|