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

components/password_manager/core/browser/affiliation_utils.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/password_manager/core/browser/affiliation_utils.h"
 
 #include <algorithm>
 #include <ostream>
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_piece.h"
 #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"
 #include "url/url_canon_stdstring.h"
 
 namespace password_manager {
 
 namespace {
 
 // The scheme used for identifying Android applications.
@@ skipping 308 matching lines @@
   return facet.IsValidAndroidFacetURI();
 }
 
 std::string GetHumanReadableOrigin(const autofill::PasswordForm& password_form,
                                    const std::string& languages) {
   password_manager::FacetURI facet_uri =
       password_manager::FacetURI::FromPotentiallyInvalidSpec(
           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