Move media library path resolution into Chrome path provider.

webkit/support/test_webkit_client.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/support/test_webkit_client.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/metrics/stats_counters.h"
@@ skipping 66 matching lines @@
       extensions_v8::GearsExtension::Get());
   WebKit::WebRuntimeFeatures::enableSockets(true);
   WebKit::WebRuntimeFeatures::enableApplicationCache(true);
   WebKit::WebRuntimeFeatures::enableDatabase(true);
   WebKit::WebRuntimeFeatures::enableWebGL(true);
   WebKit::WebRuntimeFeatures::enablePushState(true);
   WebKit::WebRuntimeFeatures::enableNotifications(true);
   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
   WebKit::WebRuntimeFeatures::enableGeolocation(false);
 
   // Construct and initialize an appcache system for this scope.
   // A new empty temp directory is created to house any cached
   // content during the run. Upon exit that directory is deleted.
   // If we can't create a tempdir, we'll use in-memory storage.
   if (!appcache_dir_.CreateUniqueTempDir()) {
@@ skipping 240 matching lines @@
 }
 #endif
 
 WebKit::WebSharedWorkerRepository* TestWebKitClient::sharedWorkerRepository() {
   return NULL;
 }
 
 WebKit::WebGraphicsContext3D* TestWebKitClient::createGraphicsContext3D() {
   return new webkit::gpu::WebGraphicsContext3DInProcessImpl();
 }