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

components/url_formatter/elide_url_unittest.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/ios/ios_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 #include "url/gurl.h"
 
 using base::UTF8ToUTF16;
@@ skipping 10 matching lines @@
 #if !defined(OS_ANDROID)
 void RunUrlTest(Testcase* testcases, size_t num_testcases) {
   static const gfx::FontList font_list;
   for (size_t i = 0; i < num_testcases; ++i) {
     const GURL url(testcases[i].input);
     // Should we test with non-empty language list?
     // That's kinda redundant with net_util_unittests.
     const float available_width =
         GetStringWidthF(UTF8ToUTF16(testcases[i].output), font_list);
     EXPECT_EQ(UTF8ToUTF16(testcases[i].output),
-              secure_display::ElideUrl(url, font_list, available_width,
-                                       std::string()));
+              url_formatter::ElideUrl(url, font_list, available_width,
+                                      std::string()));
   }
 }
 
 // Test eliding of commonplace URLs.
 TEST(TextEliderTest, TestGeneralEliding) {
   const std::string kEllipsisStr(kEllipsis);
   Testcase testcases[] = {
       {"http://www.google.com/intl/en/ads/", "www.google.com/intl/en/ads/"},
       {"http://www.google.com/intl/en/ads/", "www.google.com/intl/en/ads/"},
       {"http://www.google.com/intl/en/ads/",
@@ skipping 30 matching lines @@
       font_list);
 
   // Create the expected string, after elision. Depending on font size, the
   // directory might become /dir... or /di... or/d... - it never should be
   // shorter than that. (If it is, the font considers d... to be longer
   // than .../... -  that should never happen).
   ASSERT_GT(GetStringWidthF(UTF8ToUTF16(kEllipsisStr + "/" + kEllipsisStr),
                             font_list),
             GetStringWidthF(UTF8ToUTF16("d" + kEllipsisStr), font_list));
   GURL long_url("http://battersbox.com/directorynameisreallylongtoforcetrunc");
-  base::string16 expected = secure_display::ElideUrl(
+  base::string16 expected = url_formatter::ElideUrl(
       long_url, font_list, available_width, std::string());
   // Ensure that the expected result still contains part of the directory name.
   ASSERT_GT(expected.length(), std::string("battersbox.com/d").length());
-  EXPECT_EQ(expected, secure_display::ElideUrl(url, font_list, available_width,
-                                               std::string()));
+  EXPECT_EQ(expected, url_formatter::ElideUrl(url, font_list, available_width,
+                                              std::string()));
 
   // More space available - elide directories, partially elide filename.
   Testcase testcases[] = {
       {"http://battersbox.com/directory/foo/peter_paul_and_mary.html",
        "battersbox.com/" + kEllipsisStr + "/peter" + kEllipsisStr},
   };
   RunUrlTest(testcases, arraysize(testcases));
 }
 
 // Test eliding of empty strings, URLs with ports, passwords, queries, etc.
@@ skipping 91 matching lines @@
     {"http://subdomain.reallylongdomainname.com",
      kEllipsisStr + "ain.reallylongdomainname.com"},
     {"http://a.b.c.d.e.f.com", kEllipsisStr + ".e.f.com"},
 #endif  // !defined(OS_IOS)
   };
 
   for (size_t i = 0; i < arraysize(testcases); ++i) {
     const float available_width =
         GetStringWidthF(UTF8ToUTF16(testcases[i].output), gfx::FontList());
     EXPECT_EQ(UTF8ToUTF16(testcases[i].output),
-              secure_display::ElideHost(GURL(testcases[i].input),
-                                        gfx::FontList(), available_width));
+              url_formatter::ElideHost(GURL(testcases[i].input),
+                                       gfx::FontList(), available_width));
   }
 
   // Trying to elide to a really short length will still keep the full TLD+1
   EXPECT_EQ(
       base::ASCIIToUTF16("google.com"),
-      secure_display::ElideHost(GURL("http://google.com"), gfx::FontList(), 2));
+      url_formatter::ElideHost(GURL("http://google.com"), gfx::FontList(), 2));
   EXPECT_EQ(base::UTF8ToUTF16(kEllipsisStr + ".google.com"),
-            secure_display::ElideHost(GURL("http://subdomain.google.com"),
-                                      gfx::FontList(), 2));
+            url_formatter::ElideHost(GURL("http://subdomain.google.com"),
+                                     gfx::FontList(), 2));
   EXPECT_EQ(
       base::ASCIIToUTF16("foo.bar"),
-      secure_display::ElideHost(GURL("http://foo.bar"), gfx::FontList(), 2));
+      url_formatter::ElideHost(GURL("http://foo.bar"), gfx::FontList(), 2));
 }
 
 #endif  // !defined(OS_ANDROID)
 
 TEST(TextEliderTest, FormatUrlForSecurityDisplay) {
   struct OriginTestData {
     const char* const description;
     const char* const input;
     const wchar_t* const output;
   };
@@ skipping 68 matching lines @@
       {"Trailing dot in DNS name", "https://www.example.com./get/goat",
        L"https://www.example.com."},
       {"Blob URL",
        "blob:http%3A//www.html5rocks.com/4d4ff040-6d61-4446-86d3-13ca07ec9ab9",
        L"blob:http%3A//www.html5rocks.com/"
        L"4d4ff040-6d61-4446-86d3-13ca07ec9ab9"},
   };
 
   const char languages[] = "zh-TW,en-US,en,am,ar-EG,ar";
   for (size_t i = 0; i < arraysize(tests); ++i) {
-    base::string16 formatted = secure_display::FormatUrlForSecurityDisplay(
+    base::string16 formatted = url_formatter::FormatUrlForSecurityDisplay(
         GURL(tests[i].input), std::string());
     EXPECT_EQ(base::WideToUTF16(tests[i].output), formatted)
         << tests[i].description;
     base::string16 formatted_with_languages =
-        secure_display::FormatUrlForSecurityDisplay(GURL(tests[i].input),
-                                                    languages);
+        url_formatter::FormatUrlForSecurityDisplay(GURL(tests[i].input),
+                                                   languages);
     EXPECT_EQ(base::WideToUTF16(tests[i].output), formatted_with_languages)
         << tests[i].description;
   }
 
   base::string16 formatted =
-      secure_display::FormatUrlForSecurityDisplay(GURL(), std::string());
+      url_formatter::FormatUrlForSecurityDisplay(GURL(), std::string());
   EXPECT_EQ(base::string16(), formatted)
       << "Explicitly test the 0-argument GURL constructor";
 }
 
 }  // namespace