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 a9edadff2f93c9d25a53869b65ada13ef3b25678..60639ee7db1c7c776c51a33a5254d6cf3600b68b 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_helpers.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" |
@@ -185,7 +186,7 @@ void PrinterJobHandler::OnReceivePrinterCaps( |
std::string post_data; |
std::string mime_boundary; |
- CloudPrintHelpers::CreateMimeBoundaryForUpload(&mime_boundary); |
+ cloud_print::CreateMimeBoundaryForUpload(&mime_boundary); |
if (succeeded) { |
std::string caps_hash = |
@@ -194,16 +195,14 @@ 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; |
- CloudPrintHelpers::AddMultipartValueForUpload( |
- kPrinterCapsValue, caps_and_defaults.printer_capabilities, |
- mime_boundary, caps_and_defaults.caps_mime_type, &post_data); |
- CloudPrintHelpers::AddMultipartValueForUpload( |
- kPrinterDefaultsValue, caps_and_defaults.printer_defaults, |
- mime_boundary, caps_and_defaults.defaults_mime_type, |
- &post_data); |
- CloudPrintHelpers::AddMultipartValueForUpload( |
- kPrinterCapsHashValue, caps_hash, mime_boundary, std::string(), |
- &post_data); |
+ cloud_print::AddMultipartValueForUpload(kPrinterCapsValue, |
+ caps_and_defaults.printer_capabilities, mime_boundary, |
+ caps_and_defaults.caps_mime_type, &post_data); |
+ cloud_print::AddMultipartValueForUpload(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); |
} |
} else { |
LOG(ERROR) << "Failed to get printer caps and defaults for printer: " |
@@ -219,29 +218,23 @@ void PrinterJobHandler::OnReceivePrinterCaps( |
// Remove all the exising proxy tags. |
std::string cp_tag_wildcard(kProxyTagPrefix); |
cp_tag_wildcard += ".*"; |
- CloudPrintHelpers::AddMultipartValueForUpload( |
- kPrinterRemoveTagValue, cp_tag_wildcard, mime_boundary, std::string(), |
- &post_data); |
+ cloud_print::AddMultipartValueForUpload(kPrinterRemoveTagValue, |
+ cp_tag_wildcard, mime_boundary, std::string(), &post_data); |
} |
if (printer_info.printer_name != printer_info_.printer_name) { |
- CloudPrintHelpers::AddMultipartValueForUpload(kPrinterNameValue, |
- printer_info.printer_name, |
- mime_boundary, |
- std::string(), &post_data); |
+ cloud_print::AddMultipartValueForUpload(kPrinterNameValue, |
+ printer_info.printer_name, mime_boundary, std::string(), &post_data); |
} |
if (printer_info.printer_description != printer_info_.printer_description) { |
- CloudPrintHelpers::AddMultipartValueForUpload( |
- kPrinterDescValue, printer_info.printer_description, mime_boundary, |
- std::string() , &post_data); |
+ cloud_print::AddMultipartValueForUpload(kPrinterDescValue, |
+ printer_info.printer_description, mime_boundary, |
+ std::string(), &post_data); |
} |
if (printer_info.printer_status != printer_info_.printer_status) { |
- CloudPrintHelpers::AddMultipartValueForUpload( |
- kPrinterStatusValue, |
- base::StringPrintf("%d", printer_info.printer_status), |
- mime_boundary, |
- std::string(), |
- &post_data); |
+ cloud_print::AddMultipartValueForUpload(kPrinterStatusValue, |
+ base::StringPrintf("%d", printer_info.printer_status), mime_boundary, |
+ std::string(), &post_data); |
} |
printer_info_ = printer_info; |
if (!post_data.empty()) { |