Move useful printing backend code from chrome/service/cloud_print to printing...

chrome/service/cloud_print/printer_job_handler.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/service/cloud_print/printer_job_handler.h"
 
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/md5.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/net/http_return.h"
 #include "chrome/service/cloud_print/cloud_print_consts.h"
 #include "chrome/service/cloud_print/cloud_print_helpers.h"
 #include "chrome/service/cloud_print/job_status_updater.h"
 #include "googleurl/src/gurl.h"
 #include "net/http/http_response_headers.h"
 
 PrinterJobHandler::PrinterJobHandler(
-    const cloud_print::PrinterBasicInfo& printer_info,
+    const printing::PrinterBasicInfo& printer_info,
     const PrinterInfoFromCloud& printer_info_cloud,
     const std::string& auth_token,
     const GURL& cloud_print_server_url,
     cloud_print::PrintSystem* print_system,
     Delegate* delegate)
     : print_system_(print_system),
       printer_info_(printer_info),
       printer_info_cloud_(printer_info_cloud),
       auth_token_(auth_token),
       cloud_print_server_url_(cloud_print_server_url),
       delegate_(delegate),
       local_job_id_(-1),
       next_response_handler_(NULL),
       next_failure_handler_(NULL),
       server_error_count_(0),
       print_thread_("Chrome_CloudPrintJobPrintThread"),
       job_handler_message_loop_proxy_(
           base::MessageLoopProxy::CreateForCurrentThread()),
       shutting_down_(false),
       server_job_available_(false),
       printer_update_pending_(true),
       printer_delete_pending_(false),
       task_in_progress_(false) {
 }
 
 bool PrinterJobHandler::Initialize() {
-  if (print_system_->IsValidPrinter(printer_info_.printer_name)) {
+  if (print_system_->GetPrintBackend()->IsValidPrinter(
+      printer_info_.printer_name)) {
     printer_watcher_ = print_system_->CreatePrinterWatcher(
         printer_info_.printer_name);
     printer_watcher_->StartWatching(this);
     NotifyJobAvailable();
   } else {
     // This printer does not exist any more. Delete it from the server.
     OnPrinterDeleted();
   }
   return true;
 }
@@ skipping 70 matching lines @@
     MessageLoop::current()->PostTask(
         FROM_HERE, NewRunnableMethod(this, &PrinterJobHandler::Start));
   }
 }
 
 bool PrinterJobHandler::UpdatePrinterInfo() {
   VLOG(1) << "CP_PROXY: Update printer info, id: "
           << printer_info_cloud_.printer_id;
   // We need to update the parts of the printer info that have changed
   // (could be printer name, description, status or capabilities).
-  cloud_print::PrinterBasicInfo printer_info;
+  printing::PrinterBasicInfo printer_info;
   printer_watcher_->GetCurrentPrinterInfo(&printer_info);
-  cloud_print::PrinterCapsAndDefaults printer_caps;
+  printing::PrinterCapsAndDefaults printer_caps;
   std::string post_data;
   std::string mime_boundary;
   CloudPrintHelpers::CreateMimeBoundaryForUpload(&mime_boundary);
-  if (print_system_->GetPrinterCapsAndDefaults(printer_info.printer_name,
-                                               &printer_caps)) {
+  if (print_system_->GetPrintBackend()->GetPrinterCapsAndDefaults(
+      printer_info.printer_name, &printer_caps)) {
     std::string caps_hash = MD5String(printer_caps.printer_capabilities);
     if (caps_hash != printer_info_cloud_.caps_hash) {
       // Hashes don't match, we need to upload new capabilities (the defaults
       // go for free along with the capabilities)
       printer_info_cloud_.caps_hash = caps_hash;
       CloudPrintHelpers::AddMultipartValueForUpload(
           kPrinterCapsValue, printer_caps.printer_capabilities,
           mime_boundary, printer_caps.caps_mime_type, &post_data);
       CloudPrintHelpers::AddMultipartValueForUpload(
           kPrinterDefaultsValue, printer_caps.printer_defaults,
@@ skipping 515 matching lines @@
 }
 
 void PrinterJobHandler::OnJobSpoolFailed() {
   DCHECK(MessageLoop::current() == print_thread_.message_loop());
   job_spooler_ = NULL;
   job_handler_message_loop_proxy_->PostTask(FROM_HERE,
                                             NewRunnableMethod(this,
                                                 &PrinterJobHandler::JobFailed,
                                                 PRINT_FAILED));
 }
-