| Index: content/browser/renderer_host/media/video_capture_controller.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
|
| index 1094773bd2e13deec66c714559f1fca0bb2d6627..002f893ea72cb97d04158d1f109f7b6ae0f2c022 100644
|
| --- a/content/browser/renderer_host/media/video_capture_controller.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_controller.cc
|
| @@ -144,7 +144,7 @@ VideoCaptureController::GetWeakPtrForIOThread() {
|
| return weak_ptr_factory_.GetWeakPtr();
|
| }
|
|
|
| -std::unique_ptr<media::VideoCaptureDevice::Client>
|
| +std::unique_ptr<device::VideoCaptureDevice::Client>
|
| VideoCaptureController::NewDeviceClient() {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| return base::WrapUnique(new VideoCaptureDeviceClient(
|
| @@ -355,7 +355,7 @@ VideoCaptureController::~VideoCaptureController() {
|
| }
|
|
|
| void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(
|
| - std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,
|
| + std::unique_ptr<device::VideoCaptureDevice::Client::Buffer> buffer,
|
| const scoped_refptr<VideoFrame>& frame) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| const int buffer_id = buffer->id();
|
| @@ -458,7 +458,7 @@ void VideoCaptureController::DoBufferDestroyedOnIOThread(
|
|
|
| void VideoCaptureController::DoNewBufferOnIOThread(
|
| ControllerClient* client,
|
| - media::VideoCaptureDevice::Client::Buffer* buffer,
|
| + device::VideoCaptureDevice::Client::Buffer* buffer,
|
| const scoped_refptr<media::VideoFrame>& frame) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| const int buffer_id = buffer->id();
|
|
|