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

chrome/browser/chrome_to_mobile_service.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/browser/chrome_to_mobile_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/guid.h"
@@ skipping 27 matching lines @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/oauth2_access_token_fetcher.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
+#include "net/base/mime_util.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "sync/notifier/invalidation_util.h"
 
 namespace {
 
 enum Metric {
   DEVICES_REQUESTED = 0,  // Cloud print was contacted to list devices.
   DEVICES_AVAILABLE,      // Cloud print returned 1+ compatible devices.
@@ skipping 72 matching lines @@
   base::JSONWriter::Write(&json, &json_string);
   return json_string;
 }
 
 // Get the POST content type for a cloud print job submission.
 std::string GetContentType(ChromeToMobileService::JobType type) {
   return (type == ChromeToMobileService::SNAPSHOT) ?
       "multipart/related" : "text/plain";
 }
 
-// Utility function to call cloud_print::AddMultipartValueForUpload.
+// Utility function to call net::AddMultipartValueForUpload.
 void AddValue(const std::string& value_name,
               const std::string& value,
               const std::string& mime_boundary,
               std::string* post_data) {
-  cloud_print::AddMultipartValueForUpload(value_name, value, mime_boundary,
-                                          std::string(), post_data);
+  net::AddMultipartValueForUpload(value_name, value, mime_boundary,
+                                  std::string(), post_data);
 }
 
 // Append the Chrome To Mobile client query parameter, used by cloud print.
 GURL AppendClientQueryParam(const GURL& url) {
   GURL::Replacements replacements;
   std::string query("client=chrome-to-mobile");
   replacements.SetQueryStr(query);
   return url.ReplaceComponents(replacements);
 }
 
@@ skipping 419 matching lines @@
       break;
     default:
       NOTREACHED() << "Unknown mobile_os " << data.mobile_os;
       break;
   }
 
   AddValue("title", UTF16ToUTF8(data.title), bound, &post);
   AddValue("contentType", GetContentType(data.type), bound, &post);
 
   // Add the snapshot or use dummy content to workaround a URL submission error.
-  cloud_print::AddMultipartValueForUpload("content",
+  net::AddMultipartValueForUpload("content",
       data.snapshot_content.empty() ? "content" : data.snapshot_content,
       bound, "text/mhtml", &post);
   post.append("--" + bound + "--\r\n");

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

Optional: For completeness, should we also turn this into a
function in net/mime_util.h?

You can find other instances of this line if you search for
"Terminate the request body" in the other files in this CL.

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

SGTM. Done.

 
   LogMetric(data.type == SNAPSHOT ? SENDING_SNAPSHOT : SENDING_URL);
   net::URLFetcher* request = net::URLFetcher::Create(
       GetSubmitURL(cloud_print_url_), net::URLFetcher::POST, this);
   url_fetchers_.push_back(request);
   InitRequest(request);
   request_observer_map_[request] = observer;
   request->SetUploadData("multipart/form-data; boundary=" + bound, post);
   request->Start();
 }
@@ skipping 153 matching lines @@
 
       // Report failure below and ignore the second response.
       request_observer_map_.erase(other);
       break;
     }
   }
 
   if (observer.get())
     observer->OnSendComplete(success);
 }