chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc - Issue 93583003: Reland 237634 and 237645.

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: chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc

Issue 93583003: Reland 237634 and 237645. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase at 237726. Created 7 years, 1 month 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

Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc

diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc

index 97bcab1e7a55701c4408749160b5c27747ea0090..cfbe430a7db0c277189246f3fd47c53d191cf7cc 100644

--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc

+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc

@@ -143,7 +143,8 @@ class DesktopCaptureApiTest : public ExtensionApiTest {

} // namespace

// Flaky on Windows: http://crbug.com/301887

-#if defined(OS_WIN)

+// Failing on ChromeOS: http://crbug.com/324179

+#if defined(OS_WIN) || defined(OS_CHROMEOS)

#define MAYBE_ChooseDesktopMedia DISABLED_ChooseDesktopMedia

#else

#define MAYBE_ChooseDesktopMedia ChooseDesktopMedia

« no previous file with comments | « no previous file | content/browser/renderer_host/media/desktop_capture_device_ash.h » ('j') | no next file with comments »