content/shell/app/shell_main_delegate.cc - Issue 877323009: Extracted media mime type checks from net/base/ into media/base/

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 877323009: Extracted media mime type checks from net/base/ into media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Build fixes #1 Created 5 years, 10 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

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 1ef486ce631ad929bdd0eea711898c848107c899..332f0261a84ac9126e956de120d0fe774494923a 100644

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

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

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

#include "content/shell/renderer/layout_test/layout_test_content_renderer_client.h"

#include "content/shell/renderer/shell_content_renderer_client.h"

#include "media/base/media_switches.h"

+#include "media/base/mime_util.h"

#include "net/cookies/cookie_monster.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/ui_base_paths.h"

@@ -203,7 +204,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {

// Unless/until WebM files are added to the media layout tests, we need to

// avoid removing MP4/H264/AAC so that layout tests can run on Android.

#if !defined(OS_ANDROID)

- net::RemoveProprietaryMediaTypesAndCodecsForTests();

+ media::RemoveProprietaryMediaTypesAndCodecsForTests();

#endif

if (!BlinkTestPlatformInitialize()) {

« no previous file with comments | « content/shell/DEPS ('k') | media/base/BUILD.gn » ('j') | net/base/mime_util.cc » ('J')