content/test/content_test_suite.cc - Issue 1141703002: Chromium changes for static linking ffmpeg

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/test/content_test_suite.cc

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Roll DEPS to fix cros, rebase. Created 5 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/test/content_test_suite.cc

diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc

index 20db1eae1018f24570f61ca8bd4b9d166ea8a9b9..e3b2ae2865549dc3a65ad8992acf1e1061fef063 100644

--- a/content/test/content_test_suite.cc

+++ b/content/test/content_test_suite.cc

@@ -153,7 +153,7 @@ void ContentTestSuite::Initialize() {

}

RegisterPathProvider();

#if !defined(OS_IOS)

- media::InitializeMediaLibraryForTesting();

+ media::InitializeMediaLibrary();

// When running in a child process for Mac sandbox tests, the sandbox exists

// to initialize GL, so don't do it here.

if (!base::CommandLine::ForCurrentProcess()->HasSwitch(