Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Unified Diff: webkit/support/test_webkit_client.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:
View side-by-side diff with in-line comments
Download patch
Index: webkit/support/test_webkit_client.cc
diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc
index fd314a4b3f6d62918142c1414da64e5c03db877d..30528cce916e7452f2e0d14b22eb94cef24fb8d3 100644
--- a/webkit/support/test_webkit_client.cc
+++ b/webkit/support/test_webkit_client.cc
@@ -84,18 +84,18 @@ TestWebKitClient::TestWebKitClient(bool unit_test_mode)
WebKit::WebRuntimeFeatures::enableTouch(true);
// Load libraries for media and enable the media player.
- bool enable_media = false;
FilePath module_path;
if (PathService::Get(base::DIR_MODULE, &module_path)) {
#if defined(OS_MACOSX)
if (base::mac::AmIBundled())
module_path = module_path.DirName().DirName().DirName();
#endif
- if (media::InitializeMediaLibrary(module_path))
- enable_media = true;
+ media::InitializeMediaLibrary(module_path);
}
- WebKit::WebRuntimeFeatures::enableMediaPlayer(enable_media);
- LOG_IF(WARNING, !enable_media) << "Failed to initialize the media library.\n";
+ WebKit::WebRuntimeFeatures::enableMediaPlayer(
+ media::IsMediaLibraryInitialized());
+ LOG_IF(WARNING, !media::IsMediaLibraryInitialized())
+ << "Failed to initialize the media library.\n";
// TODO(joth): Make a dummy geolocation service implemenation for
// test_shell, and set this to true. http://crbug.com/36451

Powered by Google App Engine
This is Rietveld 408576698