Move media library path resolution into Chrome path provider.

webkit/tools/test_shell/test_shell_webkit_init.cc

 // Copyright (c) 2011 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/tools/test_shell/test_shell_webkit_init.h"
 
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
 #include "media/base/media.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
@@ skipping 34 matching lines @@
 
   // TODO(hwennborg): Enable this once the implementation supports it.
   WebKit::WebRuntimeFeatures::enableDeviceMotion(false);
   WebKit::WebRuntimeFeatures::enableDeviceOrientation(true);
 
   // Enable experimental I18N API for testing.
   WebKit::WebRuntimeFeatures::enableJavaScriptI18NAPI(true);
 
   // 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);
 
   // 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()) {
     LOG(WARNING) << "Failed to create a temp dir for the appcache, "
                     "using in-memory storage.";
@@ skipping 219 matching lines @@
 }
 
 WebKit::WebSharedWorkerRepository*
 TestShellWebKitInit::sharedWorkerRepository() {
   return NULL;
 }
 
 WebKit::WebGraphicsContext3D* TestShellWebKitInit::createGraphicsContext3D() {
   return new webkit::gpu::WebGraphicsContext3DInProcessImpl();
 }