Added ConnectorSettings class.

chrome/service/cloud_print/cloud_print_proxy_backend.h

Index: chrome/service/cloud_print/cloud_print_proxy_backend.h
diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.h b/chrome/service/cloud_print/cloud_print_proxy_backend.h
index ee47e81da11525d4a83f1d9d9ed74c6ea9659033..a78ce3bcd9840900f654bf89652610f3ff7de7d5 100644
--- a/chrome/service/cloud_print/cloud_print_proxy_backend.h
+++ b/chrome/service/cloud_print/cloud_print_proxy_backend.h
@@ -9,10 +9,9 @@
 #include <string>
 
 #include "base/threading/thread.h"
+#include "chrome/service/cloud_print/connector_settings.h"
 #include "printing/backend/print_backend.h"
 
-class GURL;
-
 namespace base {
 class DictionaryValue;
 }
@@ -56,13 +55,10 @@ class CloudPrintProxyBackend {
  public:
   // It is OK for print_system_settings to be NULL. In this case system should
   // use system default settings.
-  CloudPrintProxyBackend(
-      CloudPrintProxyFrontend* frontend,
-      const std::string& proxy_id,
-      const GURL& cloud_print_server_url,
-      const base::DictionaryValue* print_sys_settings,
-      const gaia::OAuthClientInfo& oauth_client_info,
-      bool enable_job_poll);
+  CloudPrintProxyBackend(CloudPrintProxyFrontend* frontend,
+                         const ConnectorSettings& settings,
+                         const gaia::OAuthClientInfo& oauth_client_info,
+                         bool enable_job_poll);
   ~CloudPrintProxyBackend();
 
   // Called when the user enables Google Cloud Print.
@@ -70,22 +66,18 @@ class CloudPrintProxyBackend {
   // the previously persisted credentials if any. We will use this is the passed
   // in LSID belongs to the same user as |last_user_email|.
   bool InitializeWithLsid(const std::string& lsid,
-                          const std::string& proxy_id,
                           const std::string& last_robot_refresh_token,
                           const std::string& last_robot_email,
                           const std::string& last_user_email);
   // Legacy mechanism when we have saved user credentials but no saved robot
   // credentials.
-  bool InitializeWithToken(const std::string& cloud_print_token,
-                           const std::string& proxy_id);
+  bool InitializeWithToken(const std::string& cloud_print_token);
   // Called when we have saved robot credentials.
   bool InitializeWithRobotToken(const std::string& robot_oauth_refresh_token,
-                                const std::string& robot_email,
-                                const std::string& proxy_id);
+                                const std::string& robot_email);
   // Called when an external entity passed in the auth code for the robot.
   bool InitializeWithRobotAuthCode(const std::string& robot_oauth_auth_code,
-                                   const std::string& robot_email,
-                                   const std::string& proxy_id);
+                                   const std::string& robot_email);
   void Shutdown();
   void RegisterPrinters(const printing::PrinterList& printer_list);
   void UnregisterPrinters();