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

chrome/common/cloud_print/cloud_print_helpers.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/common/cloud_print/cloud_print_helpers.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/cloud_print/cloud_print_constants.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/mime_util.h"
 
 namespace cloud_print {
 
 namespace {
 
 // Returns printer tags generated from |printer_tags| and the default tags
 // required by cloud print server.
 PrinterTags PreparePrinterTags(const PrinterTags& printer_tags) {
   PrinterTags printer_tags_out = printer_tags;
   chrome::VersionInfo version_info;
@@ skipping 153 matching lines @@
     return scoped_ptr<base::DictionaryValue>();
 
   scoped_ptr<base::DictionaryValue> response_dict(
       static_cast<base::DictionaryValue*>(message_value.release()));
   if (succeeded &&
       !response_dict->GetBoolean(kSuccessValue, succeeded))
     *succeeded = false;
   return response_dict.Pass();
 }
 
-void AddMultipartValueForUpload(const std::string& value_name,
-                                const std::string& value,
-                                const std::string& mime_boundary,
-                                const std::string& content_type,
-                                std::string* post_data) {
-  DCHECK(post_data);
-  // First line is the boundary
-  post_data->append("--" + mime_boundary + "\r\n");
-  // Next line is the Content-disposition
-  post_data->append(base::StringPrintf("Content-Disposition: form-data; "
-                   "name=\"%s\"\r\n", value_name.c_str()));
-  if (!content_type.empty()) {
-    // If Content-type is specified, the next line is that
-    post_data->append(base::StringPrintf("Content-Type: %s\r\n",
-                      content_type.c_str()));
-  }
-  // Leave an empty line and append the value.
-  post_data->append(base::StringPrintf("\r\n%s\r\n", value.c_str()));
-}
-
 std::string GetMultipartMimeType(const std::string& mime_boundary) {
   return std::string("multipart/form-data; boundary=") + mime_boundary;
 }
 
 // Create a MIME boundary marker (27 '-' characters followed by 16 hex digits).
 void CreateMimeBoundaryForUpload(std::string* out) {
   int r1 = base::RandInt(0, kint32max);
   int r2 = base::RandInt(0, kint32max);
   base::SStringPrintf(out, "---------------------------%08X%08X", r1, r2);
 }
@@ skipping 13 matching lines @@
        it != printer_tags_prepared.end(); ++it) {
     // TODO(gene) Escape '=' char from name. Warning for now.
     if (it->first.find('=') != std::string::npos) {
       LOG(WARNING) <<
           "CP_PROXY: Printer option name contains '=' character";
       NOTREACHED();
     }
     // All our tags have a special prefix to identify them as such.
     std::string msg = base::StringPrintf("%s%s=%s",
         proxy_tag_prefix.c_str(), it->first.c_str(), it->second.c_str());
-    AddMultipartValueForUpload(kPrinterTagValue, msg, mime_boundary,
+    net::AddMultipartValueForUpload(kPrinterTagValue, msg, mime_boundary,
         std::string(), &post_data);
   }
   std::string tags_hash_msg = base::StringPrintf("%s=%s",
       tags_hash_tag_name.c_str(),
       HashPrinterTags(printer_tags_prepared).c_str());
-  AddMultipartValueForUpload(kPrinterTagValue, tags_hash_msg, mime_boundary,
-      std::string(), &post_data);
+  net::AddMultipartValueForUpload(kPrinterTagValue, tags_hash_msg,
+      mime_boundary, std::string(), &post_data);
   return post_data;
 }
 
 std::string GetCloudPrintAuthHeader(const std::string& auth_token) {
   return base::StringPrintf("Authorization: OAuth %s", auth_token.c_str());
 }
 
 }  // namespace cloud_print