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

chrome/service/cloud_print/printer_job_handler.cc

 // 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.
 
 #include "chrome/service/cloud_print/printer_job_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/md5.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/common/cloud_print/cloud_print_constants.h"
 #include "chrome/common/cloud_print/cloud_print_helpers.h"
 #include "chrome/service/cloud_print/cloud_print_consts.h"

[msw, 2012/11/17 00:22:30]

ditto nit to remove this include if unused.

[Chen Yu, 2012/11/26 12:07:06]

Done.

 #include "chrome/service/cloud_print/cloud_print_helpers.h"
 #include "chrome/service/cloud_print/job_status_updater.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "printing/backend/print_backend.h"
 #include "ui/base/l10n/l10n_util.h"
 
 PrinterJobHandler::JobDetails::JobDetails() {}
@@ skipping 223 matching lines @@
 PrinterJobHandler::HandleJobMetadataResponse(
     const net::URLFetcher* source,
     const GURL& url,
     DictionaryValue* json_data,
     bool succeeded) {
   VLOG(1) << "CP_CONNECTOR: Handling job metadata response"
           << ", printer id: " << printer_info_cloud_.printer_id;
   bool job_available = false;
   if (succeeded) {
     ListValue* job_list = NULL;
-    if (json_data->GetList(kJobListValue, &job_list) && job_list) {
+    if (json_data->GetList(cloud_print::kJobListValue, &job_list) && job_list) {

[msw, 2012/11/17 00:22:30]

ditto nit: put this file in the cloud_print namespace and remove the specifiers.

[Chen Yu, 2012/11/26 12:07:06]

Done.

       // Even though it is a job list, for now we are only interested in the
       // first job
       DictionaryValue* job_data = NULL;
       if (job_list->GetDictionary(0, &job_data)) {
         job_available = true;
-        job_data->GetString(kIdValue, &job_details_.job_id_);
-        job_data->GetString(kTitleValue, &job_details_.job_title_);
+        job_data->GetString(cloud_print::kIdValue, &job_details_.job_id_);
+        job_data->GetString(cloud_print::kTitleValue, &job_details_.job_title_);
         std::string print_ticket_url;
-        job_data->GetString(kTicketUrlValue, &print_ticket_url);
-        job_data->GetString(kFileUrlValue, &print_data_url_);
+        job_data->GetString(cloud_print::kTicketUrlValue, &print_ticket_url);
+        job_data->GetString(cloud_print::kFileUrlValue, &print_data_url_);
 
         // Get tags for print job.
         job_details_.tags_.clear();
         ListValue* tags = NULL;
-        if (job_data->GetList(kTagsValue, &tags)) {
+        if (job_data->GetList(cloud_print::kTagsValue, &tags)) {
           for (size_t i = 0; i < tags->GetSize(); i++) {
             std::string value;
             if (tags->GetString(i, &value))
               job_details_.tags_.push_back(value);
           }
         }
         SetNextDataHandler(&PrinterJobHandler::HandlePrintTicketResponse);
         request_ = new CloudPrintURLFetcher;
         request_->StartGetRequest(GURL(print_ticket_url.c_str()),
                                   this,
@@ skipping 130 matching lines @@
       if (!task_in_progress_ && job_check_pending_) {
         task_in_progress_ = true;
         VLOG(1) << "CP_CONNECTOR: Changed task in progress"
                 ", printer id: " << printer_info_cloud_.printer_id
                 << ", task in progress: " << task_in_progress_;
         job_check_pending_ = false;
         // We need to fetch any pending jobs for this printer
         SetNextJSONHandler(&PrinterJobHandler::HandleJobMetadataResponse);
         request_ = new CloudPrintURLFetcher;
         request_->StartGetRequest(
-            CloudPrintHelpers::GetUrlForJobFetch(
+            cloud_print::GetUrlForJobFetch(
                 cloud_print_server_url_, printer_info_cloud_.printer_id,
                 job_fetch_reason_),
             this,
             kCloudPrintAPIMaxRetryCount,
             std::string());
         last_job_fetch_time_ = base::TimeTicks::Now();
         VLOG(1) << "CP_CONNECTOR: Last job fetch time"
                 << ", printer name: " << printer_info_.printer_name.c_str()
                 << ", timestamp: " << last_job_fetch_time_.ToInternalValue();
         job_fetch_reason_.clear();
@@ skipping 162 matching lines @@
   std::string mime_boundary;
   cloud_print::CreateMimeBoundaryForUpload(&mime_boundary);
 
   if (succeeded) {
     std::string caps_hash =
         base::MD5String(caps_and_defaults.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;
-      cloud_print::AddMultipartValueForUpload(kPrinterCapsValue,
+      cloud_print::AddMultipartValueForUpload(cloud_print::kPrinterCapsValue,
           caps_and_defaults.printer_capabilities, mime_boundary,
           caps_and_defaults.caps_mime_type, &post_data);
-      cloud_print::AddMultipartValueForUpload(kPrinterDefaultsValue,
+      cloud_print::AddMultipartValueForUpload(
+          cloud_print::kPrinterDefaultsValue,
           caps_and_defaults.printer_defaults, mime_boundary,
           caps_and_defaults.defaults_mime_type, &post_data);
-      cloud_print::AddMultipartValueForUpload(kPrinterCapsHashValue,
-          caps_hash, mime_boundary, std::string(), &post_data);
+      cloud_print::AddMultipartValueForUpload(
+          cloud_print::kPrinterCapsHashValue, caps_hash, mime_boundary,
+          std::string(), &post_data);
     }
   } else {
     LOG(ERROR) << "Failed to get printer caps and defaults"
                << ", printer name: " << printer_name;
   }
 
   std::string tags_hash = CloudPrintHelpers::GetHashOfPrinterTags(printer_info);
   if (tags_hash != printer_info_cloud_.tags_hash) {
     printer_info_cloud_.tags_hash = tags_hash;
     post_data += CloudPrintHelpers::GetPostDataForPrinterTags(printer_info,
                                                               mime_boundary);
     // Remove all the existing proxy tags.
     std::string cp_tag_wildcard(kProxyTagPrefix);
     cp_tag_wildcard += ".*";
-    cloud_print::AddMultipartValueForUpload(kPrinterRemoveTagValue,
+    cloud_print::AddMultipartValueForUpload(cloud_print::kPrinterRemoveTagValue,
         cp_tag_wildcard, mime_boundary, std::string(), &post_data);
   }
 
   if (printer_info.printer_name != printer_info_.printer_name) {
-    cloud_print::AddMultipartValueForUpload(kPrinterNameValue,
+    cloud_print::AddMultipartValueForUpload(cloud_print::kPrinterNameValue,
         printer_info.printer_name, mime_boundary, std::string(), &post_data);
   }
   if (printer_info.printer_description != printer_info_.printer_description) {
-    cloud_print::AddMultipartValueForUpload(kPrinterDescValue,
+    cloud_print::AddMultipartValueForUpload(cloud_print::kPrinterDescValue,
       printer_info.printer_description, mime_boundary,
       std::string(), &post_data);
   }
   if (printer_info.printer_status != printer_info_.printer_status) {
-    cloud_print::AddMultipartValueForUpload(kPrinterStatusValue,
+    cloud_print::AddMultipartValueForUpload(cloud_print::kPrinterStatusValue,
         base::StringPrintf("%d", printer_info.printer_status), mime_boundary,
         std::string(), &post_data);
   }
   printer_info_ = printer_info;
   if (!post_data.empty()) {
     // Terminate the request body
     post_data.append("--" + mime_boundary + "--\r\n");
     std::string mime_type("multipart/form-data; boundary=");
     mime_type += mime_boundary;
     SetNextJSONHandler(&PrinterJobHandler::HandlePrinterUpdateResponse);
     request_ = new CloudPrintURLFetcher;
     request_->StartPostRequest(
-        CloudPrintHelpers::GetUrlForPrinterUpdate(
+        cloud_print::GetUrlForPrinterUpdate(
             cloud_print_server_url_, printer_info_cloud_.printer_id),
         this,
         kCloudPrintAPIMaxRetryCount,
         mime_type,
         post_data,
         std::string());
   } else {
     // We are done here. Go to the Stop state
     VLOG(1) << "CP_CONNECTOR: Stopping printer job handler"
             << ", printer name: " << printer_name;
@@ skipping 21 matching lines @@
   if (!job_spooler_->Spool(job_details.print_ticket_,
                            job_details.print_data_file_path_,
                            job_details.print_data_mime_type_,
                            printer_name,
                            UTF16ToUTF8(document_name),
                            job_details.tags_,
                            this)) {
     OnJobSpoolFailed();
   }
 }