content/browser/renderer_host/media/video_capture_device_client_unittest.cc - Issue 2214533002: move //media/capture to //device/capture

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/video_capture_device_client_unittest.cc

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/media/video_capture_device_client.cc ('k') | content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_device_client_unittest.cc

diff --git a/content/browser/renderer_host/media/video_capture_device_client_unittest.cc b/content/browser/renderer_host/media/video_capture_device_client_unittest.cc

index c944647d6b99889ff76fd991ecf1f7c03eabb6ab..0a06d42f0a99e88beadedcf1525365419f22a9a8 100644

--- a/content/browser/renderer_host/media/video_capture_device_client_unittest.cc

+++ b/content/browser/renderer_host/media/video_capture_device_client_unittest.cc

@@ -44,7 +44,7 @@ class MockVideoCaptureController : public VideoCaptureController {

MOCK_METHOD1(DoBufferDestroyedOnIOThread, void(int buffer_id_to_drop));

void DoIncomingCapturedVideoFrameOnIOThread(

- std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,

+ std::unique_ptr<device::VideoCaptureDevice::Client::Buffer> buffer,

const scoped_refptr<media::VideoFrame>& frame) override {

MockDoIncomingCapturedVideoFrameOnIOThread(frame->coded_size());

}

@@ -63,7 +63,7 @@ class VideoCaptureDeviceClientTest : public ::testing::Test {

protected:

const content::TestBrowserThreadBundle thread_bundle_;

const std::unique_ptr<MockVideoCaptureController> controller_;

- const std::unique_ptr<media::VideoCaptureDevice::Client> device_client_;

+ const std::unique_ptr<device::VideoCaptureDevice::Client> device_client_;

private:

DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceClientTest);