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

components/url_formatter/elide_url.cc

 // Copyright 2014 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/secure_display/elide_url.h"
+#include "components/url_formatter/elide_url.h"
 
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/url_formatter/url_formatter.h"
 #include "net/base/escape.h"
-#include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 using base::UTF8ToUTF16;
 using gfx::ElideText;
 using gfx::GetStringWidthF;
 using gfx::kEllipsisUTF16;
@@ skipping 79 matching lines @@
     *url_subdomain = url_host->substr(0, domain_start_index);
   if ((*url_subdomain == kWwwPrefix || url_subdomain->empty() ||
        url.SchemeIsFile())) {
     url_subdomain->clear();
   }
 }
 
 #endif  // !defined(OS_ANDROID)
 }  // namespace
 
-namespace secure_display {
+namespace url_formatter {
 
 #if !defined(OS_ANDROID)
 
 // TODO(pkasting): http://crbug.com/77883 This whole function gets
 // kerning/ligatures/etc. issues potentially wrong by assuming that the width of
 // a rendered string is always the sum of the widths of its substrings.  Also I
 // suspect it could be made simpler.
 base::string16 ElideUrl(const GURL& url,
                         const gfx::FontList& font_list,
                         float available_pixel_width,
                         const std::string& languages) {
   // Get a formatted string and corresponding parsing of the url.
   url::Parsed parsed;
-  const base::string16 url_string =
-      net::FormatUrl(url, languages, net::kFormatUrlOmitAll,
-                     net::UnescapeRule::SPACES, &parsed, NULL, NULL);
+  const base::string16 url_string = url_formatter::FormatUrl(
+      url, languages, url_formatter::kFormatUrlOmitAll,
+      net::UnescapeRule::SPACES, &parsed, nullptr, nullptr);
   if (available_pixel_width <= 0)
     return url_string;
 
   // If non-standard, return plain eliding.
   if (!url.IsStandard())
     return ElideText(url_string, font_list, available_pixel_width,
                      gfx::ELIDE_TAIL);
 
   // Now start eliding url_string to fit within available pixel width.
   // Fist pass - check to see whether entire url_string fits.
@@ skipping 167 matching lines @@
   const base::string16 elided_subdomain =
       ElideText(url_subdomain, font_list, subdomain_width, gfx::ELIDE_HEAD);
   return elided_subdomain + url_domain;
 }
 
 #endif  // !defined(OS_ANDROID)
 
 base::string16 FormatUrlForSecurityDisplay(const GURL& url,
                                            const std::string& languages) {
   if (!url.is_valid() || url.is_empty() || !url.IsStandard())
-    return net::FormatUrl(url, languages);
+    return url_formatter::FormatUrl(url, languages);
 
   const base::string16 colon(base::ASCIIToUTF16(":"));
   const base::string16 scheme_separator(
       base::ASCIIToUTF16(url::kStandardSchemeSeparator));
 
   if (url.SchemeIsFile()) {
     return base::ASCIIToUTF16(url::kFileScheme) + scheme_separator +
            base::UTF8ToUTF16(url.path());
   }
 
@@ skipping 17 matching lines @@
   result += base::UTF8ToUTF16(host);
 
   const int port = origin.IntPort();
   const int default_port = url::DefaultPortForScheme(
       scheme.c_str(), static_cast<int>(scheme.length()));
   if (port != url::PORT_UNSPECIFIED && port != default_port)
     result += colon + base::UTF8ToUTF16(origin.port());
 
   return result;
 }
-}  // namespace secure_display
+}  // namespace url_formatter