Revert of Move net::FormatUrl and friends outside of //net and into //components (patchset #16 id:290001 of https://codereview.chromium.org/1171333003/ )

Reason for revert:
breaks gn_check on Android: https://build.chromium.org/p/chromium.linux/builders/Android%20GN/builds/28796/steps/gn_check/logs/stdio

Original issue's description:
> Move net::FormatUrl and friends outside of //net and into //components
>
> net::FormatUrl and related are specifically concerned with display
> policies of URLs, which is not something that //net needs to be aware
> of, as that's a UX question.
>
> This folds in net::FormatURL along with the existing //components/url_fixer
> and //components/secure_display into a common component,
> //components/url_formatter, that handles reformatting URLs for user-friendly
> or data storage (url_formatter), for use in security prompts (elide_url),
> or for reformatting URLs from user input (url_fixer)
>
> (Disabling presubmit since this is intentionally not fixing a legacy API, just moving it for future cleanups)
>
> BUG=486979
> NOPRESUBMIT=true
>
> Committed: https://crrev.com/1659865c3eb47166c82378bb840801135b057a09
> Cr-Commit-Position: refs/heads/master@{#341605}

TBR=droger@chromium.org,jam@chromium.org,mkwst@chromium.org,pkasting@chromium.org,sky@chromium.org,stuartmorgan@chromium.org,felt@chromium.org,rsleevi@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=486979

Review URL: https://codereview.chromium.org/1260033005

Cr-Commit-Position: refs/heads/master@{#341691}

3 files changed, 3 insertions, 5 deletions

diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
index 85358c0..6db040a 100644
--- a/components/content_settings/core/browser/BUILD.gn
+++ b/components/content_settings/core/browser/BUILD.gn
@@ -48,7 +48,6 @@ static_library("browser") {
     "//components/content_settings/core/common",
     "//components/plugins/common",
     "//components/pref_registry:pref_registry",
-    "//components/url_formatter",
     "//net",
     "//url",
   ]
diff --git a/components/content_settings/core/browser/DEPS b/components/content_settings/core/browser/DEPS
index 106fea2..ee92881 100644
--- a/components/content_settings/core/browser/DEPS
+++ b/components/content_settings/core/browser/DEPS
@@ -4,7 +4,6 @@ include_rules = [
   "+components/keyed_service/core",
   "+components/plugins/common",
   "+components/pref_registry",
-  "+components/url_formatter",
   "+net/base",
   "+net/cookies",
 ]
diff --git a/components/content_settings/core/browser/content_settings_usages_state.cc b/components/content_settings/core/browser/content_settings_usages_state.cc
index 8113260..89b938c 100644
--- a/components/content_settings/core/browser/content_settings_usages_state.cc
+++ b/components/content_settings/core/browser/content_settings_usages_state.cc
@@ -9,7 +9,7 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
-#include "components/url_formatter/url_formatter.h"
+#include "net/base/net_util.h"
 
 ContentSettingsUsagesState::CommittedDetails::CommittedDetails()
     : current_url_valid(false) {
@@ -106,7 +106,7 @@ void ContentSettingsUsagesState::GetDetailedInfo(
 std::string ContentSettingsUsagesState::GURLToFormattedHost(
     const GURL& url) const {
   base::string16 display_host;
-  url_formatter::AppendFormattedHost(
-      url, pref_service_->GetString(accept_language_pref_), &display_host);
+  net::AppendFormattedHost(url, pref_service_->GetString(accept_language_pref_),
+                           &display_host);
   return base::UTF16ToUTF8(display_host);
 }