Move net::FormatUrl and friends outside of //net and into //components

components/error_page/renderer/net_error_helper_core.cc

 // Copyright 2013 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 "components/error_page/renderer/net_error_helper_core.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_value_converter.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "components/error_page/common/error_page_params.h"
+#include "components/url_formatter/url_formatter.h"
 #include "content/public/common/url_constants.h"
 #include "grit/components_strings.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
-#include "net/base/net_util.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 namespace error_page {
 
 namespace {
 
@@ skipping 98 matching lines @@
   GURL::Replacements remove_params;
   remove_params.ClearUsername();
   remove_params.ClearPassword();
   remove_params.ClearQuery();
   remove_params.ClearRef();
   return url.ReplaceComponents(remove_params);
 }
 
 // Sanitizes and formats a URL for upload to the error correction service.
 std::string PrepareUrlForUpload(const GURL& url) {
-  // TODO(yuusuke): Change to net::FormatUrl when Link Doctor becomes
+  // TODO(yuusuke): Change to url_formatter::FormatUrl when Link Doctor becomes
   // unicode-capable.
   std::string spec_to_send = SanitizeURL(url).spec();
 
   // Notify navigation correction service of the url truncation by sending of
   // "?" at the end.
   if (url.has_query())
     spec_to_send.append("?");
   return spec_to_send;
 }
 
@@ skipping 98 matching lines @@
   params->SetString("eventId", response.event_id);
   params->SetString("fingerprint", response.fingerprint);
 
   return CreateRequestBody("linkdoctor.fixurl.clicktracking", error_param,
                            correction_params, params.Pass());
 }
 
 base::string16 FormatURLForDisplay(const GURL& url, bool is_rtl,
                                    const std::string accept_languages) {
   // Translate punycode into UTF8, unescape UTF8 URLs.
-  base::string16 url_for_display(net::FormatUrl(
-      url, accept_languages, net::kFormatUrlOmitNothing,
-      net::UnescapeRule::NORMAL, NULL, NULL, NULL));
+  base::string16 url_for_display(url_formatter::FormatUrl(
+      url, accept_languages, url_formatter::kFormatUrlOmitNothing,
+      net::UnescapeRule::NORMAL, nullptr, nullptr, nullptr));
   // URLs are always LTR.
   if (is_rtl)
     base::i18n::WrapStringWithLTRFormatting(&url_for_display);
   return url_for_display;
 }
 
 scoped_ptr<NavigationCorrectionResponse> ParseNavigationCorrectionResponse(
     const std::string raw_response) {
   // TODO(mmenke):  Open source related protocol buffers and use them directly.
   scoped_ptr<base::Value> parsed = base::JSONReader::Read(raw_response);
@@ skipping 762 matching lines @@
       committed_error_page_info_->error,
       *committed_error_page_info_->navigation_correction_params,
       *response,
       *response->corrections[tracking_id]);
   delegate_->SendTrackingRequest(
       committed_error_page_info_->navigation_correction_params->url,
       request_body);
 }
 
 }  // namespace error_page