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

chrome/service/cloud_print/cloud_print_connector.cc

Index: chrome/service/cloud_print/cloud_print_connector.cc
diff --git a/chrome/service/cloud_print/cloud_print_connector.cc b/chrome/service/cloud_print/cloud_print_connector.cc
index fa927f34019f35e03c3111b8e6943ff189eefa8c..f5d4d570b697ed3dcaee6ac15c801ceb07fa39a8 100644
--- a/chrome/service/cloud_print/cloud_print_connector.cc
+++ b/chrome/service/cloud_print/cloud_print_connector.cc
@@ -13,6 +13,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]

Please remove if now unused.

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

Done.

 #include "chrome/service/cloud_print/cloud_print_helpers.h"
@@ -39,7 +40,8 @@ bool CloudPrintConnector::InitPrintSystem() {
   if (!result.succeeded()) {
     print_system_ = NULL;
     // We could not initialize the print system. We need to notify the server.
-    ReportUserMessage(kPrintSystemFailedMessageId, result.message());
+    ReportUserMessage(cloud_print::kPrintSystemFailedMessageId,

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

nit: consider putting this file's contents in the cloud_print namespace and
removing the specifiers.

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

Done.

+                      result.message());
     return false;
   }
   return true;
@@ -111,7 +113,7 @@ void CloudPrintConnector::CheckForJobs(const std::string& reason,
           IDS_CLOUD_PRINT_ZOMBIE_PRINTER);
       LOG(ERROR) << "CP_CONNECTOR: " << status_message <<
           " Printer_id: " << printer_id;
-      ReportUserMessage(kZombiePrinterMessageId, status_message);
+      ReportUserMessage(cloud_print::kZombiePrinterMessageId, status_message);
     }
   } else {
     for (JobHandlerMap::iterator index = job_handler_map_.begin();
@@ -196,7 +198,7 @@ CloudPrintConnector::HandlePrinterListResponse(
       message = l10n_util::GetStringFUTF8(IDS_CLOUD_PRINT_ENUM_FAILED,
           l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT));
     // There was a failure enumerating printers. Send a message to the server.
-    ReportUserMessage(kEnumPrintersFailedMessageId, message);
+    ReportUserMessage(cloud_print::kEnumPrintersFailedMessageId, message);
   }
 
   // Go through the list of the cloud printers and init print job handlers.
@@ -208,9 +210,9 @@ CloudPrintConnector::HandlePrinterListResponse(
       DictionaryValue* printer_data = NULL;
       if (printer_list->GetDictionary(index, &printer_data)) {
         std::string printer_name;
-        printer_data->GetString(kNameValue, &printer_name);
+        printer_data->GetString(cloud_print::kNameValue, &printer_name);
         std::string printer_id;
-        printer_data->GetString(kIdValue, &printer_id);
+        printer_data->GetString(cloud_print::kIdValue, &printer_id);
         if (settings_.IsPrinterBlacklisted(printer_name)) {
           VLOG(1) << "CP_CONNECTOR: Deleting " << printer_name <<
               " id: " << printer_id << " as blacklisted";
@@ -309,11 +311,11 @@ void CloudPrintConnector::ReportUserMessage(const std::string& message_id,
   // Result of this request will be ignored.
   std::string mime_boundary;
   cloud_print::CreateMimeBoundaryForUpload(&mime_boundary);
-  GURL url = CloudPrintHelpers::GetUrlForUserMessage(settings_.server_url(),
-                                                     message_id);
+  GURL url = cloud_print::GetUrlForUserMessage(settings_.server_url(),
+                                               message_id);
   std::string post_data;
-  cloud_print::AddMultipartValueForUpload(kMessageTextValue, failure_msg,
-      mime_boundary, std::string(), &post_data);
+  cloud_print::AddMultipartValueForUpload(cloud_print::kMessageTextValue,
+      failure_msg, mime_boundary, std::string(), &post_data);
   // Terminate the request body
   post_data.append("--" + mime_boundary + "--\r\n");
   std::string mime_type("multipart/form-data; boundary=");
@@ -340,7 +342,8 @@ void CloudPrintConnector::InitJobHandlerForPrinter(
     DictionaryValue* printer_data) {
   DCHECK(printer_data);
   PrinterJobHandler::PrinterInfoFromCloud printer_info_cloud;
-  printer_data->GetString(kIdValue, &printer_info_cloud.printer_id);
+  printer_data->GetString(cloud_print::kIdValue,
+                          &printer_info_cloud.printer_id);
   DCHECK(!printer_info_cloud.printer_id.empty());
   VLOG(1) << "CP_CONNECTOR: Init job handler"
           << ", printer id: " << printer_info_cloud.printer_id;
@@ -350,19 +353,20 @@ void CloudPrintConnector::InitJobHandlerForPrinter(
     return;  // Nothing to do if we already have a job handler for this printer.
 
   printing::PrinterBasicInfo printer_info;
-  printer_data->GetString(kNameValue, &printer_info.printer_name);
+  printer_data->GetString(cloud_print::kNameValue, &printer_info.printer_name);
   DCHECK(!printer_info.printer_name.empty());
-  printer_data->GetString(kPrinterDescValue,
+  printer_data->GetString(cloud_print::kPrinterDescValue,
                           &printer_info.printer_description);
   // Printer status is a string value which actually contains an integer.
   std::string printer_status;
-  if (printer_data->GetString(kPrinterStatusValue, &printer_status)) {
+  if (printer_data->GetString(
+      cloud_print::kPrinterStatusValue, &printer_status)) {
     base::StringToInt(printer_status, &printer_info.printer_status);
   }
-  printer_data->GetString(kPrinterCapsHashValue,
+  printer_data->GetString(cloud_print::kPrinterCapsHashValue,
       &printer_info_cloud.caps_hash);
   ListValue* tags_list = NULL;
-  if (printer_data->GetList(kTagsValue, &tags_list) && tags_list) {
+  if (printer_data->GetList(cloud_print::kTagsValue, &tags_list) && tags_list) {
     for (size_t index = 0; index < tags_list->GetSize(); index++) {
       std::string tag;
       if (tags_list->GetString(index, &tag) &&
@@ -451,7 +455,7 @@ void CloudPrintConnector::ContinuePendingTaskProcessing() {
 }
 
 void CloudPrintConnector::OnPrintersAvailable() {
-  GURL printer_list_url = CloudPrintHelpers::GetUrlForPrinterList(
+  GURL printer_list_url = cloud_print::GetUrlForPrinterList(
       settings_.server_url(), settings_.proxy_id());
   StartGetRequest(printer_list_url,
                   kCloudPrintRegisterMaxRetryCount,
@@ -488,7 +492,7 @@ void CloudPrintConnector::OnPrinterDelete(const std::string& printer_id) {
   // TODO(gene): We probably should not try indefinitely here. Just once or
   // twice should be enough.
   // Bug: http://code.google.com/p/chromium/issues/detail?id=101850
-  GURL url = CloudPrintHelpers::GetUrlForPrinterDelete(
+  GURL url = cloud_print::GetUrlForPrinterDelete(
       settings_.server_url(), printer_id, "printer_deleted");
   StartGetRequest(url,
                   kCloudPrintAPIMaxRetryCount,
@@ -513,7 +517,8 @@ void CloudPrintConnector::OnReceivePrinterCaps(
         IDS_CLOUD_PRINT_REGISTER_PRINTER_FAILED,
         printer_name_utf16,
         l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT));
-    ReportUserMessage(kGetPrinterCapsFailedMessageId, status_message);
+    ReportUserMessage(cloud_print::kGetPrinterCapsFailedMessageId,
+                      status_message);
 
     ContinuePendingTaskProcessing();  // Skip this printer registration.
     return;
@@ -526,26 +531,26 @@ void CloudPrintConnector::OnReceivePrinterCaps(
   cloud_print::CreateMimeBoundaryForUpload(&mime_boundary);
   std::string post_data;
 
-  cloud_print::AddMultipartValueForUpload(kProxyIdValue, settings_.proxy_id(),
-      mime_boundary, std::string(), &post_data);
-  cloud_print::AddMultipartValueForUpload(kPrinterNameValue, info.printer_name,
-      mime_boundary, std::string(), &post_data);
-  cloud_print::AddMultipartValueForUpload(kPrinterDescValue,
-      info.printer_description, mime_boundary, std::string() , &post_data);
-  cloud_print::AddMultipartValueForUpload(kPrinterStatusValue,
+  cloud_print::AddMultipartValueForUpload(cloud_print::kProxyIdValue,
+      settings_.proxy_id(), mime_boundary, std::string(), &post_data);
+  cloud_print::AddMultipartValueForUpload(cloud_print::kPrinterNameValue,
+      info.printer_name, mime_boundary, std::string(), &post_data);
+  cloud_print::AddMultipartValueForUpload(cloud_print::kPrinterDescValue,
+      info.printer_description, mime_boundary, std::string(), &post_data);
+  cloud_print::AddMultipartValueForUpload(cloud_print::kPrinterStatusValue,
       base::StringPrintf("%d", info.printer_status),
       mime_boundary, std::string(), &post_data);
   post_data += CloudPrintHelpers::GetPostDataForPrinterTags(info,
                                                             mime_boundary);
-  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);
   // Send a hash of the printer capabilities to the server. We will use this
   // later to check if the capabilities have changed
-  cloud_print::AddMultipartValueForUpload(kPrinterCapsHashValue,
+  cloud_print::AddMultipartValueForUpload(cloud_print::kPrinterCapsHashValue,
       base::MD5String(caps_and_defaults.printer_capabilities),
       mime_boundary, std::string(), &post_data);
 
@@ -554,7 +559,7 @@ void CloudPrintConnector::OnReceivePrinterCaps(
   std::string mime_type("multipart/form-data; boundary=");
   mime_type += mime_boundary;
 
-  GURL post_url = CloudPrintHelpers::GetUrlForPrinterRegistration(
+  GURL post_url = cloud_print::GetUrlForPrinterRegistration(
       settings_.server_url());
   StartPostRequest(post_url,
                    kCloudPrintAPIMaxRetryCount,