The ServiceProcessControl class is now a singleton and is not keyed off the profile.

BUG=80170
TEST=Unit-tests, Cloud Print proxy.


Review URL: http://codereview.chromium.org/7074023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87580 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 16 deletions

diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
index 6962926..86dc073 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/service/service_process_control.h"
-#include "chrome/browser/service/service_process_control_manager.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/cloud_print/cloud_print_proxy_info.h"
 #include "chrome/common/pref_names.h"
@@ -158,8 +157,7 @@ void CloudPrintProxyService::OnCloudPrintSetupClosed() {
 
 void CloudPrintProxyService::RefreshCloudPrintProxyStatus() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  ServiceProcessControl* process_control =
-      ServiceProcessControlManager::GetInstance()->GetProcessControl(profile_);
+  ServiceProcessControl* process_control = ServiceProcessControl::GetInstance();
   DCHECK(process_control->is_connected());
   ServiceProcessControl::CloudPrintProxyInfoHandler* callback =
        NewCallback(this, &CloudPrintProxyService::ProxyInfoCallback);
@@ -169,8 +167,7 @@ void CloudPrintProxyService::RefreshCloudPrintProxyStatus() {
 
 void CloudPrintProxyService::EnableCloudPrintProxy(const std::string& lsid,
                                                    const std::string& email) {
-  ServiceProcessControl* process_control =
-      ServiceProcessControlManager::GetInstance()->GetProcessControl(profile_);
+  ServiceProcessControl* process_control = ServiceProcessControl::GetInstance();
   DCHECK(process_control->is_connected());
   process_control->Send(new ServiceMsg_EnableCloudPrintProxy(lsid));
   // Assume the IPC worked.
@@ -181,8 +178,7 @@ void CloudPrintProxyService::EnableCloudPrintProxyWithRobot(
     const std::string& robot_auth_code,
     const std::string& robot_email,
     const std::string& user_email) {
-  ServiceProcessControl* process_control =
-      ServiceProcessControlManager::GetInstance()->GetProcessControl(profile_);
+  ServiceProcessControl* process_control = ServiceProcessControl::GetInstance();
   DCHECK(process_control->is_connected());
   process_control->Send(new ServiceMsg_EnableCloudPrintProxyWithRobot(
       robot_auth_code,
@@ -194,8 +190,7 @@ void CloudPrintProxyService::EnableCloudPrintProxyWithRobot(
 
 
 void CloudPrintProxyService::DisableCloudPrintProxy() {
-  ServiceProcessControl* process_control =
-      ServiceProcessControlManager::GetInstance()->GetProcessControl(profile_);
+  ServiceProcessControl* process_control = ServiceProcessControl::GetInstance();
   DCHECK(process_control->is_connected());
   process_control->Send(new ServiceMsg_DisableCloudPrintProxy);
   // Assume the IPC worked.
@@ -210,10 +205,6 @@ void CloudPrintProxyService::ProxyInfoCallback(
 }
 
 bool CloudPrintProxyService::InvokeServiceTask(Task* task) {
-  ServiceProcessControl* process_control =
-      ServiceProcessControlManager::GetInstance()->GetProcessControl(profile_);
-  DCHECK(process_control);
-  if (process_control)
-    process_control->Launch(task, NULL);
-  return !!process_control;
+  ServiceProcessControl::GetInstance()->Launch(task, NULL);
+  return true;
 }
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
index 20763b5..6f1fd1e 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/service/service_process_control.h"
-#include "chrome/browser/service/service_process_control_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"