content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc - Issue 100743003: Extend content::DesktopMediaID to allow Aura windows as capture sources.

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/desktop_capture_device_ash_unittest.cc

Issue 100743003: Extend content::DesktopMediaID to allow Aura windows as capture sources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years 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

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

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

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

index 2e82475219dc80eb461d85f82a1b8fe8fbe59535..d14746e96d35716fc472fbcc1790981c47d6f429 100644

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

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

@@ -6,6 +6,7 @@

#include "base/synchronization/waitable_event.h"

#include "content/browser/browser_thread_impl.h"

+#include "content/public/browser/desktop_media_id.h"

#include "media/video/capture/video_capture_types.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -94,9 +95,9 @@ class DesktopCaptureDeviceAshTest : public testing::Test {

};

TEST_F(DesktopCaptureDeviceAshTest, StartAndStop) {

- DesktopMediaID source(DesktopMediaID::TYPE_SCREEN, 0);

scoped_ptr<media::VideoCaptureDevice> capture_device(

- DesktopCaptureDeviceAsh::Create(source));

+ DesktopCaptureDeviceAsh::Create(

+ content::DesktopMediaID::RegisterAuraWindow(root_window())));

scoped_ptr<MockDeviceClient> client(new MockDeviceClient());

EXPECT_CALL(*client, OnError()).Times(0);