Initialize media library on service process startup.

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"
 #include "base/environment.h"
 #include "base/i18n/rtl.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/service_process_util.h"
 #include "chrome/service/cloud_print/cloud_print_proxy.h"
 #include "chrome/service/service_ipc_server.h"
 #include "chrome/service/service_process_prefs.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "media/base/media.h"
 #include "net/base/network_change_notifier.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(ENABLE_REMOTING)
 #include "chrome/service/remoting/chromoting_host_manager.h"
 #endif  // defined(ENABLED_REMOTING)
 
 ServiceProcess* g_service_process = NULL;
@@ skipping 113 matching lines @@
     service_prefs_->GetString(prefs::kApplicationLocale, &locale);
     // 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());
-#endif
+#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 39 matching lines @@
 static void QuitMessageLoop(MessageLoop* message_loop) {
   message_loop->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }
 
 // This method is called when a shutdown command is received from IPC channel
 // or there was an error in the IPC channel.
 void ServiceProcess::Shutdown() {
 #if defined(ENABLE_REMOTING)
   // During shutdown of remoting host it has some left over operations on
   // the UI thread. So we let the teardown to proceed asynchronously
-  remoting_host_manager_->Teardown(
+  if (remoting_host_manager_.get())

[Alpha Left Google, 2011/02/17 17:23:10]

nit: since the following statement span across two lines, please use {} to
enclose it.

+    remoting_host_manager_->Teardown(
       NewRunnableFunction(&QuitMessageLoop, main_message_loop_));

[Alpha Left Google, 2011/02/17 17:23:10]

nit: indent this by 4 spaces.

 #else
   // Quit the main message loop.
   main_message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 #endif
 }
 
 bool ServiceProcess::HandleClientDisconnect() {
   // If there are no enabled services or if there is an update available
   // we want to shutdown right away. Else we want to keep listening for
   // new connections.
@@ skipping 77 matching lines @@
 }
 
 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);