Remove the Remoting Host component from Chrome.

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 10 matching lines @@
 #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/net/service_url_request_context.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(TOOLKIT_USES_GTK)
 #include "ui/gfx/gtk_util.h"
 #include <gtk/gtk.h>
 #endif
 
-#if defined(ENABLE_REMOTING)
-#include "chrome/service/remoting/chromoting_host_manager.h"
-#if defined(OS_MACOSX)
-#include "base/mac/mac_util.h"
-#endif  // defined(OS_MACOSX)
-#endif  // defined(ENABLED_REMOTING)
-
 ServiceProcess* g_service_process = NULL;
 
 namespace {
 
 // Delay in millseconds after the last service is disabled before we attempt
 // a shutdown.
 const int64 kShutdownDelay = 60000;
 
 const char kDefaultServiceProcessLocale[] = "en-US";
 
@@ skipping 122 matching lines @@
     // the prefs.
     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
-  FilePath module_path;
-  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);
   }
 
   if (cloud_print_proxy_enabled) {
@@ skipping 28 matching lines @@
   io_thread_.reset();
   file_thread_.reset();
   // The NetworkChangeNotifier must be destroyed after all other threads that
   // might use it have been shut down.
   network_change_notifier_.reset();
 
   service_process_state_->SignalStopped();
   return true;
 }
 
-#if defined(ENABLE_REMOTING)
-static void QuitMessageLoop(MessageLoop* message_loop) {
-  message_loop->PostTask(FROM_HERE, new MessageLoop::QuitTask());
-}
-#endif
-
 // 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
-  if (remoting_host_manager_.get()) {
-    remoting_host_manager_->Teardown(
-        NewRunnableFunction(&QuitMessageLoop, main_message_loop_));
-  }
-#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.
   if (!enabled_services_ || update_available()) {
     Shutdown();
     return false;
   }
@@ skipping 19 matching lines @@
 
 void ServiceProcess::OnCloudPrintProxyDisabled(bool persist_state) {
   if (persist_state) {
     // Save the preference that we have disabled the cloud print proxy.
     service_prefs_->SetBoolean(prefs::kCloudPrintProxyEnabled, false);
     service_prefs_->WritePrefs();
   }
   OnServiceDisabled();
 }
 
-void ServiceProcess::OnChromotingHostEnabled() {
-  OnServiceEnabled();
-}
-
-void ServiceProcess::OnChromotingHostDisabled() {
-  OnServiceDisabled();
-}
-
 ServiceURLRequestContextGetter*
 ServiceProcess::GetServiceURLRequestContextGetter() {
   DCHECK(request_context_getter_.get());
   return request_context_getter_.get();
 }
 
 void ServiceProcess::OnServiceEnabled() {
   enabled_services_++;
   if ((1 == enabled_services_) &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 36 matching lines @@
     } else {
       Shutdown();
     }
   }
 }
 
 ServiceProcess::~ServiceProcess() {
   Teardown();
   g_service_process = NULL;
 }