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

net/base/mime_util.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 <algorithm>
 #include <iterator>
 #include <map>
 #include <string>
 
 #include "net/base/mime_util.h"
 #include "net/base/platform_mime_util.h"
 
 #include "base/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"

[wtc, 2013/05/14 18:45:29]

I believe this can be avoided. See the comment below.

[Henrik Grunell, 2013/05/15 11:49:31]

Done.

 #include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
 
 using std::string;
 
 namespace {
 
 struct MediaType {
   const char name[12];
   const char matcher[13];
@@ skipping 953 matching lines @@
   }
   return CERTIFICATE_MIME_TYPE_UNKNOWN;
 }
 
 bool IsSupportedCertificateMimeType(const std::string& mime_type) {
   CertificateMimeType file_type =
       GetCertificateMimeTypeForMimeType(mime_type);
   return file_type != CERTIFICATE_MIME_TYPE_UNKNOWN;
 }
 
+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

[wtc, 2013/05/14 18:45:29]

Nit: add periods (.) to the end of sentences in comments.

[Henrik Grunell, 2013/05/15 11:49:31]

Done.

+  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()));

[wtc, 2013/05/14 18:45:29]

The only format specifier this function uses is %s, so it
doesn't seem necessary to use base::StringPrintf().

For example, this post_data->append() call can be rewritten as:
  post_data->append("Content-Disposition: form-data; name=\"" +
                    value_name + "\"\r\n");

or

  post_data->append("Content-Disposition: form-data; name=\"");
  post_data->append(value_name);
  post_data->append("\"\r\n");

[Henrik Grunell, 2013/05/15 11:49:31]

Just copied the function over. Agree that's better. Done.

+  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()));
+}
+
 }  // namespace net