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

components/url_fixer/url_fixer.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 "components/url_fixer/url_fixer.h"
 
 #include <algorithm>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #if defined(OS_POSIX)
 #include "base/path_service.h"
 #endif
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/url_formatter/url_formatter.h"
 #include "net/base/escape.h"
 #include "net/base/filename_util.h"
-#include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/third_party/mozilla/url_parse.h"
 #include "url/url_file.h"
 #include "url/url_util.h"
 
 const char* url_fixer::home_directory_override = NULL;
 
 namespace {
 
 // Hardcode these constants to avoid dependences on //chrome and //content.
@@ skipping 143 matching lines @@
 #elif defined(OS_POSIX)
   base::FilePath input_path(text);
   PrepareStringForFileOps(input_path, &filename);
   if (filename.length() > 0 && filename[0] == '~')
     filename = FixupHomedir(filename);
 #endif
 
   // Here, we know the input looks like a file.
   GURL file_url = net::FilePathToFileURL(base::FilePath(filename));
   if (file_url.is_valid()) {
-    return base::UTF16ToUTF8(net::FormatUrl(file_url,
-                                            std::string(),
-                                            net::kFormatUrlOmitUsernamePassword,
-                                            net::UnescapeRule::NORMAL,
-                                            NULL,
-                                            NULL,
-                                            NULL));
+    return base::UTF16ToUTF8(url_formatter::FormatUrl(
+        file_url, std::string(), url_formatter::kFormatUrlOmitUsernamePassword,
+        net::UnescapeRule::NORMAL, nullptr, nullptr, nullptr));
   }
 
   // Invalid file URL, just return the input.
   return text;
 }
 
 // Checks |domain| to see if a valid TLD is already present.  If not, appends
 // |desired_tld| to the domain, and prepends "www." unless it's already present.
 void AddDesiredTLD(const std::string& desired_tld, std::string* domain) {
   if (desired_tld.empty() || domain->empty())
@@ skipping 430 matching lines @@
       is_file = false;
   }
 
   // Put back the current directory if we saved it.
   if (!base_dir.empty())
     base::SetCurrentDirectory(old_cur_directory);
 
   if (is_file) {
     GURL file_url = net::FilePathToFileURL(full_path);
     if (file_url.is_valid())
-      return GURL(
-          base::UTF16ToUTF8(net::FormatUrl(file_url,
-                                           std::string(),
-                                           net::kFormatUrlOmitUsernamePassword,
-                                           net::UnescapeRule::NORMAL,
-                                           NULL,
-                                           NULL,
-                                           NULL)));
+      return GURL(base::UTF16ToUTF8(url_formatter::FormatUrl(
+          file_url, std::string(),
+          url_formatter::kFormatUrlOmitUsernamePassword,
+          net::UnescapeRule::NORMAL, nullptr, nullptr, nullptr)));
     // Invalid files fall through to regular processing.
   }
 
 // Fall back on regular fixup for this input.
 #if defined(OS_WIN)
   std::string text_utf8 = base::WideToUTF8(text.value());
 #elif defined(OS_POSIX)
   std::string text_utf8 = text.value();
 #endif
   return FixupURL(text_utf8, std::string());
@@ skipping 11 matching lines @@
       part->reset();
   }
 }
 
 bool url_fixer::IsEquivalentScheme(const std::string& scheme1,
                                    const std::string& scheme2) {
   return scheme1 == scheme2 ||
       (scheme1 == url::kAboutScheme && scheme2 == kChromeUIScheme) ||
       (scheme1 == kChromeUIScheme && scheme2 == url::kAboutScheme);
 }