Move common cloud print methods from service/cloud_print to common/cloud_print.

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"
 
+namespace cloud_print {
+
 // CloudPrintConnector handles top printer management tasks.
 //  - Matching local and cloud printers
 //  - Registration of local printers
 //  - Deleting cloud printers
 // 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>,
-      private cloud_print::PrintServerWatcherDelegate,
+      private PrintServerWatcherDelegate,
       private PrinterJobHandlerDelegate,
       private CloudPrintURLFetcherDelegate {
  public:
   class Client {
    public:
     virtual void OnAuthFailed() = 0;
    protected:
      virtual ~Client() {}
   };
 
@@ skipping 33 matching lines @@
     PendingTaskType type;
     // Optional members, depending on type.
     std::string printer_id;  // For pending delete.
     printing::PrinterBasicInfo printer_info;  // For pending registration.
 
     PendingTask() : type(PENDING_PRINTERS_NONE) {}
     ~PendingTask() {}
   };
 
   virtual ~CloudPrintConnector();
-  // cloud_print::PrintServerWatcherDelegate implementation
+  // PrintServerWatcherDelegate implementation
   virtual void OnPrinterAdded() OVERRIDE;
   // PrinterJobHandler::Delegate implementation
   virtual void OnPrinterDeleted(const std::string& printer_name) OVERRIDE;
   virtual void OnAuthError() OVERRIDE;
 
   // CloudPrintURLFetcher::Delegate implementation.
   virtual CloudPrintURLFetcher::ResponseAction HandleRawData(
       const net::URLFetcher* source,
       const GURL& url,
       const std::string& data) OVERRIDE;
@@ skipping 63 matching lines @@
   void RegisterPrinters(const printing::PrinterList& printers);
 
   bool IsSamePrinter(const std::string& name1, const std::string& name2) const;
   bool InitPrintSystem();
 
   // CloudPrintConnector client.
   Client* client_;
   // Connector settings.
   ConnectorSettings settings_;
   // Pointer to current print system.
-  scoped_refptr<cloud_print::PrintSystem> print_system_;
+  scoped_refptr<PrintSystem> print_system_;
   // Watcher for print system updates.
-  scoped_refptr<cloud_print::PrintSystem::PrintServerWatcher>
+  scoped_refptr<PrintSystem::PrintServerWatcher>
       print_server_watcher_;
   // 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_;
   // 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);
 };
 
+}  // namespace cloud_print
+
 #endif  // CHROME_SERVICE_CLOUD_PRINT_CLOUD_PRINT_CONNECTOR_H_