Move AddMultipartValueForUpload to net/base/mime_util.h/cc.

chrome/service/cloud_print/cloud_print_connector.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/cloud_print_connector.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/md5.h"
 #include "base/rand_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.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_helpers.h"
 #include "grit/generated_resources.h"
+#include "net/base/mime_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace cloud_print {
 
 CloudPrintConnector::CloudPrintConnector(Client* client,
                                          const ConnectorSettings& settings)
   : client_(client),
     next_response_handler_(NULL) {
   settings_.CopyFrom(settings);
 }
@@ skipping 276 matching lines @@
 }
 
 void CloudPrintConnector::ReportUserMessage(const std::string& message_id,
                                             const std::string& failure_msg) {
   // This is a fire and forget type of function.
   // Result of this request will be ignored.
   std::string mime_boundary;
   CreateMimeBoundaryForUpload(&mime_boundary);
   GURL url = GetUrlForUserMessage(settings_.server_url(), message_id);
   std::string post_data;
-  AddMultipartValueForUpload(kMessageTextValue, failure_msg, mime_boundary,
-                             std::string(), &post_data);
-  // Terminate the request body
-  post_data.append("--" + mime_boundary + "--\r\n");
+  net::AddMultipartValueForUpload(kMessageTextValue, failure_msg, mime_boundary,
+                                  std::string(), &post_data);
+  net::AddMultipartTerminateForUpload(mime_boundary, &post_data);
   std::string mime_type("multipart/form-data; boundary=");
   mime_type += mime_boundary;
   user_message_request_ = CloudPrintURLFetcher::Create();
   user_message_request_->StartPostRequest(url, this, 1, mime_type, post_data,
                                           std::string());
 }
 
 bool CloudPrintConnector::RemovePrinterFromList(
     const std::string& printer_name,
     printing::PrinterList* printer_list) {
@@ skipping 190 matching lines @@
     return;
   }
 
   const printing::PrinterBasicInfo& info = pending_tasks_.front().printer_info;
   DCHECK(IsSamePrinter(info.printer_name, printer_name));
 
   std::string mime_boundary;
   CreateMimeBoundaryForUpload(&mime_boundary);
   std::string post_data;
 
-  AddMultipartValueForUpload(kProxyIdValue,
+  net::AddMultipartValueForUpload(kProxyIdValue,
       settings_.proxy_id(), mime_boundary, std::string(), &post_data);
-  AddMultipartValueForUpload(kPrinterNameValue,
+  net::AddMultipartValueForUpload(kPrinterNameValue,
       info.printer_name, mime_boundary, std::string(), &post_data);
-  AddMultipartValueForUpload(kPrinterDescValue,
+  net::AddMultipartValueForUpload(kPrinterDescValue,
       info.printer_description, mime_boundary, std::string(), &post_data);
-  AddMultipartValueForUpload(kPrinterStatusValue,
+  net::AddMultipartValueForUpload(kPrinterStatusValue,
       base::StringPrintf("%d", info.printer_status),
       mime_boundary, std::string(), &post_data);
   post_data += GetPostDataForPrinterInfo(info, mime_boundary);
-  AddMultipartValueForUpload(kPrinterCapsValue,
+  net::AddMultipartValueForUpload(kPrinterCapsValue,
       caps_and_defaults.printer_capabilities, mime_boundary,
       caps_and_defaults.caps_mime_type, &post_data);
-  AddMultipartValueForUpload(kPrinterDefaultsValue,
+  net::AddMultipartValueForUpload(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
-  AddMultipartValueForUpload(kPrinterCapsHashValue,
+  net::AddMultipartValueForUpload(kPrinterCapsHashValue,
       base::MD5String(caps_and_defaults.printer_capabilities),
       mime_boundary, std::string(), &post_data);
-
-  // Terminate the request body
-  post_data.append("--" + mime_boundary + "--\r\n");
+  net::AddMultipartTerminateForUpload(mime_boundary, &post_data);
   std::string mime_type("multipart/form-data; boundary=");
   mime_type += mime_boundary;
 
   GURL post_url = GetUrlForPrinterRegistration(settings_.server_url());
   StartPostRequest(post_url,
                    kCloudPrintAPIMaxRetryCount,
                    mime_type,
                    post_data,
                    &CloudPrintConnector::HandleRegisterPrinterResponse);
 }
 
 bool CloudPrintConnector::IsSamePrinter(const std::string& name1,
                                         const std::string& name2) const {
   return (0 == base::strcasecmp(name1.c_str(), name2.c_str()));
 }
 
 }  // namespace cloud_print