Move media library path resolution into Chrome path provider.

chrome/service/service_process.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 "chrome/service/service_process.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 157 matching lines @@
     // If no locale was specified anywhere, use the default one.
     if (locale.empty())
       locale = kDefaultServiceProcessLocale;
   }
   ResourceBundle::InitSharedInstance(locale);
 
   PrepareRestartOnCrashEnviroment(command_line);
 
 #if defined(ENABLE_REMOTING)
   // Load media codecs, required by the Chromoting host
-  bool initialized_media_library = false;
-#if defined(OS_MACOSX)
-  FilePath bundle_path = base::mac::MainAppBundlePath();
-
-  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);
-#endif
-
-  // Initialize chromoting host manager.
-  remoting_host_manager_ = new remoting::ChromotingHostManager(this);
-  remoting_host_manager_->Initialize(message_loop,
-                                     file_thread_->message_loop_proxy());
+  if (PathService::Get(chrome::DIR_MEDIA_LIBS, &module_path) &&
+      media::InitializeMediaLibrary(module_path)) {
+    // Initialize chromoting host manager.
+    remoting_host_manager_ = new remoting::ChromotingHostManager(this);
+    remoting_host_manager_->Initialize(message_loop,
+                                       file_thread_->message_loop_proxy());
+  }
 #endif // ENABLE_REMOTING
 
   // Enable Cloud Print if needed. First check the command-line.
   bool cloud_print_proxy_enabled =
       command_line.HasSwitch(switches::kEnableCloudPrintProxy);
   if (!cloud_print_proxy_enabled) {
     // Then check if the cloud print proxy was previously enabled.
     service_prefs_->GetBoolean(prefs::kCloudPrintProxyEnabled,
                                &cloud_print_proxy_enabled);
   }
@@ skipping 147 matching lines @@
     } else {
       Shutdown();
     }
   }
 }
 
 ServiceProcess::~ServiceProcess() {
   Teardown();
   g_service_process = NULL;
 }
-
-// Disable refcounting for runnable method because it is really not needed
-// when we post tasks on the main message loop.
-DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcess);