content/browser/media/capture/desktop_capture_device_aura_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/media/capture/desktop_capture_device_aura_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/media/capture/desktop_capture_device_aura.cc ('k') | content/browser/media/capture/desktop_capture_device_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/capture/desktop_capture_device_aura_unittest.cc

diff --git a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc

index cca139f733380555f7153f9297086ede39dadd43..fa7effa72c876e44ef2d78fda81b39fbbb4e8e9f 100644

--- a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc

+++ b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc

@@ -39,7 +39,7 @@ namespace {

const int kFrameRate = 30;

-class MockDeviceClient : public media::VideoCaptureDevice::Client {

+class MockDeviceClient : public device::VideoCaptureDevice::Client {

public:

MOCK_METHOD6(OnIncomingCapturedData,

void(const uint8_t* data,

@@ -141,7 +141,7 @@ class DesktopCaptureDeviceAuraTest : public testing::Test {

};

TEST_F(DesktopCaptureDeviceAuraTest, StartAndStop) {

- std::unique_ptr<media::VideoCaptureDevice> capture_device =

+ std::unique_ptr<device::VideoCaptureDevice> capture_device =

DesktopCaptureDeviceAura::Create(

content::DesktopMediaID::RegisterAuraWindow(

content::DesktopMediaID::TYPE_SCREEN, root_window()));