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

chrome/service/cloud_print/printer_job_handler.cc

Index: chrome/service/cloud_print/printer_job_handler.cc
diff --git a/chrome/service/cloud_print/printer_job_handler.cc b/chrome/service/cloud_print/printer_job_handler.cc
index 0f08948c6bccc16682ff3a176ad2634936b7f14c..c6aa725be1367388d2e22bbafc4e56a558ed9c15 100644
--- a/chrome/service/cloud_print/printer_job_handler.cc
+++ b/chrome/service/cloud_print/printer_job_handler.cc
@@ -12,6 +12,7 @@
 #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"
@@ -257,22 +258,22 @@ PrinterJobHandler::HandleJobMetadataResponse(
   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))
@@ -423,7 +424,7 @@ void PrinterJobHandler::Start() {
         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,
@@ -606,14 +607,16 @@ void PrinterJobHandler::OnReceivePrinterCaps(
       // 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"
@@ -628,21 +631,21 @@ void PrinterJobHandler::OnReceivePrinterCaps(
     // 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);
   }
@@ -655,7 +658,7 @@ void PrinterJobHandler::OnReceivePrinterCaps(
     SetNextJSONHandler(&PrinterJobHandler::HandlePrinterUpdateResponse);
     request_ = new CloudPrintURLFetcher;
     request_->StartPostRequest(
-        CloudPrintHelpers::GetUrlForPrinterUpdate(
+        cloud_print::GetUrlForPrinterUpdate(
             cloud_print_server_url_, printer_info_cloud_.printer_id),
         this,
         kCloudPrintAPIMaxRetryCount,