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

components/password_manager/core/browser/affiliation_utils.cc

Index: components/password_manager/core/browser/affiliation_utils.cc
diff --git a/components/password_manager/core/browser/affiliation_utils.cc b/components/password_manager/core/browser/affiliation_utils.cc
index 059d5f8b535f45df5491c2800641b88756dc9c7c..49b25c2b86df0cf9972f28f3eda6a5fb87651979 100644
--- a/components/password_manager/core/browser/affiliation_utils.cc
+++ b/components/password_manager/core/browser/affiliation_utils.cc
@@ -14,7 +14,6 @@
 #include "base/strings/string_util.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/common/password_manager_switches.h"
-#include "components/url_formatter/url_formatter.h"
 #include "components/variations/variations_associated_data.h"
 #include "net/base/escape.h"
 #include "url/third_party/mozilla/url_parse.h"
@@ -343,8 +342,6 @@
           password_form.signon_realm);
   if (facet_uri.IsValidAndroidFacetURI())
     return facet_uri.scheme() + "://" + facet_uri.android_package_name();
-  return base::UTF16ToUTF8(
-      url_formatter::FormatUrl(password_form.origin, languages));
-}
-
+  return base::UTF16ToUTF8(net::FormatUrl(password_form.origin, languages));
+}
 }  // namespace password_manager