Move media library path resolution into Chrome path provider.

chrome/renderer/render_process_impl.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <objidl.h>
 #include <mlang.h>
@@ skipping 113 matching lines @@
   }
 
   if (command_line.HasSwitch(switches::kEnableWatchdog)) {
     // TODO(JAR): Need to implement renderer IO msgloop watchdog.
   }
 
   if (command_line.HasSwitch(switches::kDumpHistogramsOnExit)) {
     base::StatisticsRecorder::set_dump_on_exit(true);
   }
 
-#if defined(OS_MACOSX)
-  FilePath bundle_path = base::mac::MainAppBundlePath();
+  // Note that under Linux, the media library will normally already have
+  // been initialized by the Zygote before this instance became a Renderer.
+  FilePath media_path;
+  if (PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path))
+    media::InitializeMediaLibrary(media_path);
 
-  initialized_media_library_ =
-     media::InitializeMediaLibrary(bundle_path.Append("Libraries"));
-#else
-  FilePath module_path;
-  initialized_media_library_ =
-      PathService::Get(base::DIR_MODULE, &module_path) &&
-      media::InitializeMediaLibrary(module_path);
-
+#if !defined(OS_MACOSX)
   // TODO(hclam): Add more checks here. Currently this is not used.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
+  if (media::IsMediaLibraryInitialized() &&
+      CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableOpenMax)) {
-    media::InitializeOpenMaxLibrary(module_path);
+    media::InitializeOpenMaxLibrary(media_path);
   }
 #endif
 
 #if defined(OS_WIN)
   // Need to patch a few functions for font loading to work correctly.
   FilePath pdf;
   if (PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf) &&
       file_util::PathExists(pdf)) {
     g_iat_patch_createdca.Patch(
         pdf.value().c_str(), "gdi32.dll", "CreateDCA", CreateDCAPatch);
@@ skipping 111 matching lines @@
   }
 
   FreeTransportDIB(mem);
 }
 
 bool RenderProcessImpl::UseInProcessPlugins() const {
   return in_process_plugins_;
 }
 
 bool RenderProcessImpl::HasInitializedMediaLibrary() const {
-  return initialized_media_library_;
+  return media::IsMediaLibraryInitialized();
 }
 
 bool RenderProcessImpl::GetTransportDIBFromCache(TransportDIB** mem,
                                              size_t size) {
   // look for a cached object that is suitable for the requested size.
   for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) {
     if (shared_mem_cache_[i] &&
         size <= shared_mem_cache_[i]->size()) {
       *mem = shared_mem_cache_[i];
       shared_mem_cache_[i] = NULL;
@@ skipping 42 matching lines @@
 }
 
 void RenderProcessImpl::ClearTransportDIBCache() {
   for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) {
     if (shared_mem_cache_[i]) {
       FreeTransportDIB(shared_mem_cache_[i]);
       shared_mem_cache_[i] = NULL;
     }
   }
 }