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

chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

Index: chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
index 5f960b48060a62f5d235ce1c6a7824876883fc70..e9b8d2921cf8e2e4c929fce1cf904fafc27033ad 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
@@ -21,7 +21,7 @@
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/infobars/core/infobar_delegate.h"
-#include "components/url_formatter/elide_url.h"
+#include "components/secure_display/elide_url.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -118,7 +118,7 @@
   EXPECT_EQ(bubble_content_2.radio_group.radio_items[1],
             l10n_util::GetStringFUTF8(
                 IDS_ALLOWED_COOKIES_BLOCK,
-                url_formatter::FormatUrlForSecurityDisplay(
+                secure_display::FormatUrlForSecurityDisplay(
                     web_contents()->GetURL(), profile()->GetPrefs()->GetString(
                                                   prefs::kAcceptLanguages))));
   EXPECT_FALSE(bubble_content_2.custom_link.empty());
@@ -157,7 +157,7 @@
   EXPECT_EQ(bubble_content.radio_group.radio_items[0],
             l10n_util::GetStringFUTF8(
                 IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION,
-                url_formatter::FormatUrlForSecurityDisplay(
+                secure_display::FormatUrlForSecurityDisplay(
                     security_origin, profile()->GetPrefs()->GetString(
                                          prefs::kAcceptLanguages))));
   EXPECT_EQ(bubble_content.radio_group.radio_items[1],
@@ -542,7 +542,7 @@
   EXPECT_EQ(bubble_content.radio_group.radio_items[0],
             l10n_util::GetStringFUTF8(
                 IDS_ALLOWED_MEDIASTREAM_MIC_NO_ACTION,
-                url_formatter::FormatUrlForSecurityDisplay(
+                secure_display::FormatUrlForSecurityDisplay(
                     security_origin, profile()->GetPrefs()->GetString(
                                          prefs::kAcceptLanguages))));
   EXPECT_EQ(bubble_content.radio_group.radio_items[1],
@@ -576,7 +576,7 @@
   EXPECT_EQ(new_bubble_content.radio_group.radio_items[0],
             l10n_util::GetStringFUTF8(
                 IDS_BLOCKED_MEDIASTREAM_MIC_ASK,
-                url_formatter::FormatUrlForSecurityDisplay(
+                secure_display::FormatUrlForSecurityDisplay(
                     security_origin, profile()->GetPrefs()->GetString(
                                          prefs::kAcceptLanguages))));
   EXPECT_EQ(new_bubble_content.radio_group.radio_items[1],
@@ -621,7 +621,7 @@
   EXPECT_EQ(bubble_content.radio_group.radio_items[0],
             l10n_util::GetStringFUTF8(
                 IDS_ALLOWED_MEDIASTREAM_CAMERA_NO_ACTION,
-                url_formatter::FormatUrlForSecurityDisplay(
+                secure_display::FormatUrlForSecurityDisplay(
                     security_origin, profile()->GetPrefs()->GetString(
                                          prefs::kAcceptLanguages))));
   EXPECT_EQ(bubble_content.radio_group.radio_items[1],
@@ -655,7 +655,7 @@
   EXPECT_EQ(new_bubble_content.radio_group.radio_items[0],
             l10n_util::GetStringFUTF8(
                 IDS_BLOCKED_MEDIASTREAM_CAMERA_ASK,
-                url_formatter::FormatUrlForSecurityDisplay(
+                secure_display::FormatUrlForSecurityDisplay(
                     security_origin, profile()->GetPrefs()->GetString(
                                          prefs::kAcceptLanguages))));
   EXPECT_EQ(new_bubble_content.radio_group.radio_items[1],
@@ -702,7 +702,7 @@
   EXPECT_EQ(bubble_content.radio_group.radio_items[0],
             l10n_util::GetStringFUTF8(
                 IDS_ALLOWED_MEDIASTREAM_MIC_NO_ACTION,
-                url_formatter::FormatUrlForSecurityDisplay(
+                secure_display::FormatUrlForSecurityDisplay(
                     security_origin, profile()->GetPrefs()->GetString(
                                          prefs::kAcceptLanguages))));
   EXPECT_EQ(bubble_content.radio_group.radio_items[1],
@@ -734,7 +734,7 @@
   EXPECT_EQ(new_bubble_content.radio_group.radio_items[0],
             l10n_util::GetStringFUTF8(
                 IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION,
-                url_formatter::FormatUrlForSecurityDisplay(
+                secure_display::FormatUrlForSecurityDisplay(
                     security_origin, profile()->GetPrefs()->GetString(
                                          prefs::kAcceptLanguages))));
   EXPECT_EQ(new_bubble_content.radio_group.radio_items[1],