Added ConnectorSettings class.

chrome/service/cloud_print/cloud_print_connector.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_SERVICE_CLOUD_PRINT_CLOUD_PRINT_CONNECTOR_H_
 #define CHROME_SERVICE_CLOUD_PRINT_CLOUD_PRINT_CONNECTOR_H_
 
 #include <list>
 #include <map>
 #include <string>
 
 #include "base/threading/thread.h"
 #include "base/values.h"
+#include "chrome/service/cloud_print/connector_settings.h"
 #include "chrome/service/cloud_print/print_system.h"
 #include "chrome/service/cloud_print/printer_job_handler.h"
 
 // CloudPrintConnector handles top printer management tasks.
 //  - Matching local and cloud printers
 //  - Registration of local printers
 //  - Deleting cloud printers
-// All tasks are posted to the commond queue (PendingTasks) and executed
+// All tasks are posted to the common queue (PendingTasks) and executed
 // one-by-one in FIFO order.
 // CloudPrintConnector will notify client over Client interface.
 class CloudPrintConnector
     : public base::RefCountedThreadSafe<CloudPrintConnector>,
       public cloud_print::PrintServerWatcherDelegate,
       public PrinterJobHandlerDelegate,
       public CloudPrintURLFetcherDelegate {
  public:
   class Client {
    public:
     virtual void OnAuthFailed() = 0;
    protected:
      virtual ~Client() {}
   };
 
-  CloudPrintConnector(Client* client,
-                      const std::string& proxy_id,
-                      const GURL& cloud_print_server_url,
-                      const DictionaryValue* print_system_settings);
+  CloudPrintConnector(Client* client, const ConnectorSettings& settings);
 
   bool Start();
   void Stop();
   bool IsRunning();
 
   // Return list of printer ids registered with CloudPrint.
   void GetPrinterIds(std::list<std::string>* printer_ids);
 
   // Register printer from the list.
   void RegisterPrinters(const printing::PrinterList& printers);
@@ skipping 104 matching lines @@
   void OnReceivePrinterCaps(
       bool succeeded,
       const std::string& printer_name,
       const printing::PrinterCapsAndDefaults& caps_and_defaults);
 
   bool IsSamePrinter(const std::string& name1, const std::string& name2) const;
   bool InitPrintSystem();
 
   // CloudPrintConnector client.
   Client* client_;
-  // Print system settings.
-  scoped_ptr<DictionaryValue> print_system_settings_;
+  // Connector settings.
+  ConnectorSettings settings_;
   // Pointer to current print system.
   scoped_refptr<cloud_print::PrintSystem> print_system_;
   // Watcher for print system updates.
   scoped_refptr<cloud_print::PrintSystem::PrintServerWatcher>
       print_server_watcher_;
-  // Id of the Cloud Print proxy.
-  std::string proxy_id_;
-  // Cloud Print server url.
-  GURL cloud_print_server_url_;
   // A map of printer id to job handler.
   typedef std::map<std::string, scoped_refptr<PrinterJobHandler> >
       JobHandlerMap;
   JobHandlerMap job_handler_map_;
   // Next response handler.
   ResponseHandler next_response_handler_;
-  // If |true| printers that are not found locally will be deleted on GCP
-  // even if the local enumeration failed.
-  bool delete_on_enum_fail_;
   // The list of pending tasks to be done in the background.
   std::list<PendingTask> pending_tasks_;
   // The CloudPrintURLFetcher instance for the current request.
   scoped_refptr<CloudPrintURLFetcher> request_;
   // The CloudPrintURLFetcher instance for the user message request.
   scoped_refptr<CloudPrintURLFetcher> user_message_request_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPrintConnector);
 };
 
 #endif  // CHROME_SERVICE_CLOUD_PRINT_CLOUD_PRINT_CONNECTOR_H_