webkit/tools/test_shell/test_shell_webkit_init.cc - Issue 6537022: Move media library path resolution into Chrome path provider.

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: webkit/tools/test_shell/test_shell_webkit_init.cc

Issue 6537022: Move media library path resolution into Chrome path provider. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: And again, this time with working tests... Created 9 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:

Index: webkit/tools/test_shell/test_shell_webkit_init.cc

diff --git a/webkit/tools/test_shell/test_shell_webkit_init.cc b/webkit/tools/test_shell/test_shell_webkit_init.cc

index 274ad63b09af9ea06cb4c83e8d26fc63a81a3bc8..d087c10b5022ed656ad6a701aa2336ca9c2cd277 100644

--- a/webkit/tools/test_shell/test_shell_webkit_init.cc

+++ b/webkit/tools/test_shell/test_shell_webkit_init.cc

@@ -52,9 +52,10 @@ TestShellWebKitInit::TestShellWebKitInit(bool layout_test_mode) {

// Load libraries for media and enable the media player.

FilePath module_path;

+ if (PathService::Get(base::DIR_MODULE, &module_path))

+ media::InitializeMediaLibrary(module_path);

WebKit::WebRuntimeFeatures::enableMediaPlayer(

- PathService::Get(base::DIR_MODULE, &module_path) &&

- media::InitializeMediaLibrary(module_path));

+ media::IsMediaLibraryInitialized());

WebKit::WebRuntimeFeatures::enableGeolocation(true);