content/shell/app/shell_main_delegate.cc - Issue 17447011: Shuffle media-related WebMimeRegistry code from webkit/ to content/.

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/shell/app/shell_main_delegate.cc

Issue 17447011: Shuffle media-related WebMimeRegistry code from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fixes Created 7 years, 6 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/shell/app/shell_main_delegate.cc

diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc

index 6064067f2db4b303f85b2ee1040493c920a7070c..3db268d3e16a32e01e1726a9e76c07cbd59b1deb 100644

--- a/content/shell/app/shell_main_delegate.cc

+++ b/content/shell/app/shell_main_delegate.cc

@@ -142,6 +142,8 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {

command_line.AppendSwitch(switches::kEnableSoftwareCompositingGLAdapter);

net::CookieMonster::EnableFileScheme();

+ net::RemoveProprietaryMediaTypesAndCodecsForTests();

if (!WebKitTestPlatformInitialize()) {

if (exit_code)

*exit_code = 1;