content/browser/loader/resource_dispatcher_host_browsertest.cc - Issue 1225083002: media: Add BrowserCdmManagerProcessWatcher.

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/loader/resource_dispatcher_host_browsertest.cc

Issue 1225083002: media: Add BrowserCdmManagerProcessWatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: content/browser/loader/resource_dispatcher_host_browsertest.cc

diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc

index 04ba9db77428fbd82a77b1359854e9d88e70669b..c4bcf5f82e43c51d0ec82fe9e288062d6c652519 100644

--- a/content/browser/loader/resource_dispatcher_host_browsertest.cc

+++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc

@@ -305,8 +305,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,

// app isn't stripped of debug symbols, this takes about five minutes to

// complete and isn't conducive to quick turnarounds. As we don't currently

// strip the app on the build bots, this is bad times.

-// Also disabled on Android (http://crbug.com/506188).

-#if defined(OS_MACOSX) || defined(OS_ANDROID)

+#if defined(OS_MACOSX)

#define MAYBE_CrossSiteAfterCrash DISABLED_CrossSiteAfterCrash

#else

#define MAYBE_CrossSiteAfterCrash CrossSiteAfterCrash