Changed the IPC between the browser and the service process to return more detailed information about the cloud print proxy. This is a first step towards the new login mechanism for Cloud Print.

BUG=None
TEST=Unit-tests, enabling disabling cloud print proxy
Review URL: http://codereview.chromium.org/7001012

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

5 files changed, 47 insertions, 31 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 0190ae2..88b8953 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
@@ -18,6 +18,7 @@
 #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"
 #include "chrome/common/service_messages.h"
 #include "content/browser/browser_thread.h"
@@ -146,10 +147,10 @@ void CloudPrintProxyService::RefreshCloudPrintProxyStatus() {
   ServiceProcessControl* process_control =
       ServiceProcessControlManager::GetInstance()->GetProcessControl(profile_);
   DCHECK(process_control->is_connected());
-  Callback2<bool, std::string>::Type* callback =
-       NewCallback(this, &CloudPrintProxyService::StatusCallback);
-  // GetCloudPrintProxyStatus takes ownership of callback.
-  process_control->GetCloudPrintProxyStatus(callback);
+  ServiceProcessControl::CloudPrintProxyInfoHandler* callback =
+       NewCallback(this, &CloudPrintProxyService::ProxyInfoCallback);
+  // GetCloudPrintProxyInfo takes ownership of callback.
+  process_control->GetCloudPrintProxyInfo(callback);
 }
 
 void CloudPrintProxyService::EnableCloudPrintProxy(const std::string& lsid,
@@ -171,9 +172,11 @@ void CloudPrintProxyService::DisableCloudPrintProxy() {
   profile_->GetPrefs()->SetString(prefs::kCloudPrintEmail, std::string());
 }
 
-void CloudPrintProxyService::StatusCallback(bool enabled, std::string email) {
-  profile_->GetPrefs()->SetString(prefs::kCloudPrintEmail,
-                                  enabled ? email : std::string());
+void CloudPrintProxyService::ProxyInfoCallback(
+    const cloud_print::CloudPrintProxyInfo& proxy_info) {
+  profile_->GetPrefs()->SetString(
+      prefs::kCloudPrintEmail,
+      proxy_info.enabled ? proxy_info.email : std::string());
 }
 
 bool CloudPrintProxyService::InvokeServiceTask(Task* task) {
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
index fc2d94c..f6b01a0 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
@@ -15,6 +15,10 @@
 
 class Profile;
 
+namespace cloud_print {
+struct CloudPrintProxyInfo;
+}  // namespace cloud_print
+
 // Layer between the browser user interface and the cloud print proxy code
 // running in the service process.
 class CloudPrintProxyService
@@ -55,8 +59,10 @@ class CloudPrintProxyService
   void EnableCloudPrintProxy(const std::string& lsid, const std::string& email);
   void DisableCloudPrintProxy();
 
-  // Callback that gets the cloud print proxy status.
-  void StatusCallback(bool enabled, std::string email);
+  // Callback that gets the cloud print proxy info.
+  void ProxyInfoCallback(
+    const cloud_print::CloudPrintProxyInfo& proxy_info);
+
   // Invoke a task that gets run after the service process successfully
   // launches. The task typically involves sending an IPC to the service
   // process.
diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc
index 0d71241..5c07223 100644
--- a/chrome/browser/service/service_process_control.cc
+++ b/chrome/browser/service/service_process_control.cc
@@ -185,8 +185,8 @@ void ServiceProcessControl::OnProcessLaunched() {
 bool ServiceProcessControl::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ServiceProcessControl, message)
-    IPC_MESSAGE_HANDLER(ServiceHostMsg_CloudPrintProxy_IsEnabled,
-                        OnCloudPrintProxyIsEnabled)
+    IPC_MESSAGE_HANDLER(ServiceHostMsg_CloudPrintProxy_Info,
+                        OnCloudPrintProxyInfo)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -230,20 +230,20 @@ void ServiceProcessControl::Observe(NotificationType type,
   }
 }
 
-void ServiceProcessControl::OnCloudPrintProxyIsEnabled(bool enabled,
-                                                       std::string email) {
+void ServiceProcessControl::OnCloudPrintProxyInfo(
+    const cloud_print::CloudPrintProxyInfo& proxy_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (cloud_print_status_callback_ != NULL) {
-    cloud_print_status_callback_->Run(enabled, email);
-    cloud_print_status_callback_.reset();
+  if (cloud_print_info_callback_ != NULL) {
+    cloud_print_info_callback_->Run(proxy_info);
+    cloud_print_info_callback_.reset();
   }
 }
 
-bool ServiceProcessControl::GetCloudPrintProxyStatus(
-    Callback2<bool, std::string>::Type* cloud_print_status_callback) {
-  DCHECK(cloud_print_status_callback);
-  cloud_print_status_callback_.reset(cloud_print_status_callback);
-  return Send(new ServiceMsg_IsCloudPrintProxyEnabled);
+bool ServiceProcessControl::GetCloudPrintProxyInfo(
+    CloudPrintProxyInfoHandler* cloud_print_info_callback) {
+  DCHECK(cloud_print_info_callback);
+  cloud_print_info_callback_.reset(cloud_print_info_callback);
+  return Send(new ServiceMsg_GetCloudPrintProxyInfo());
 }
 
 bool ServiceProcessControl::Shutdown() {
diff --git a/chrome/browser/service/service_process_control.h b/chrome/browser/service/service_process_control.h
index 7a9456b..10e9aa0 100644
--- a/chrome/browser/service/service_process_control.h
+++ b/chrome/browser/service/service_process_control.h
@@ -23,6 +23,10 @@
 class Profile;
 class CommandLine;
 
+namespace cloud_print {
+struct CloudPrintProxyInfo;
+}  // namespace cloud_print
+
 // A ServiceProcessControl works as a portal between the service process and
 // the browser process.
 //
@@ -39,6 +43,8 @@ class ServiceProcessControl : public IPC::Channel::Sender,
  public:
   typedef IDMap<ServiceProcessControl>::iterator iterator;
   typedef std::queue<IPC::Message> MessageQueue;
+  typedef Callback1<const cloud_print::CloudPrintProxyInfo&>::Type
+      CloudPrintProxyInfoHandler;
 
   // Construct a ServiceProcessControl with |profile|..
   explicit ServiceProcessControl(Profile* profile);
@@ -78,17 +84,18 @@ class ServiceProcessControl : public IPC::Channel::Sender,
                        const NotificationDetails& details);
 
   // Message handlers
-  void OnCloudPrintProxyIsEnabled(bool enabled, std::string email);
+  void OnCloudPrintProxyInfo(
+      const cloud_print::CloudPrintProxyInfo& proxy_info);
 
   // Send a shutdown message to the service process. IPC channel will be
   // destroyed after calling this method.
   // Return true if the message was sent.
   bool Shutdown();
 
-  // Send request for cloud print proxy status and the registered
-  // email address. The callback gets the information when received.
-  bool GetCloudPrintProxyStatus(
-      Callback2<bool, std::string>::Type* cloud_print_status_callback);
+  // Send request for cloud print proxy info (enabled state, email, proxy id).
+  // The callback gets the information when received.
+  bool GetCloudPrintProxyInfo(
+      CloudPrintProxyInfoHandler* cloud_print_status_callback);
 
  private:
   // This class is responsible for launching the service process on the
@@ -152,7 +159,7 @@ class ServiceProcessControl : public IPC::Channel::Sender,
 
   // Callback that gets invoked when a status message is received from
   // the cloud print proxy.
-  scoped_ptr<Callback2<bool, std::string>::Type> cloud_print_status_callback_;
+  scoped_ptr<CloudPrintProxyInfoHandler> cloud_print_info_callback_;
 
   NotificationRegistrar registrar_;
 };
diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc
index b7b0c58..b75ec4a 100644
--- a/chrome/browser/service/service_process_control_browsertest.cc
+++ b/chrome/browser/service/service_process_control_browsertest.cc
@@ -54,13 +54,13 @@ class ServiceProcessControlBrowserTest
 
   // Send a Cloud Print status request and wait for a reply from the service.
   void SendRequestAndWait() {
-    process()->GetCloudPrintProxyStatus(NewCallback(
-        this, &ServiceProcessControlBrowserTest::CloudPrintStatusCallback));
+    process()->GetCloudPrintProxyInfo(NewCallback(
+        this, &ServiceProcessControlBrowserTest::CloudPrintInfoCallback));
     ui_test_utils::RunMessageLoop();
   }
 
-  void CloudPrintStatusCallback(
-      bool enabled, std::string email) {
+  void CloudPrintInfoCallback(
+      const cloud_print::CloudPrintProxyInfo& proxy_info) {
     MessageLoop::current()->Quit();
   }