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

chrome/browser/ui/toolbar/toolbar_model_impl.cc

 // Copyright 2012 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 "chrome/browser/ui/toolbar/toolbar_model_impl.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ssl/connection_security.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
-#include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/ssl_status.h"
 #include "grit/components_scaled_resources.h"
 #include "grit/theme_resources.h"
+#include "net/base/net_util.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
 ToolbarModelImpl::ToolbarModelImpl(ToolbarModelDelegate* delegate)
@@ skipping 18 matching lines @@
   if (profile)
     languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
 
   GURL url(GetURL());
   if (url.spec().length() > content::kMaxURLDisplayChars)
     url = url.IsStandard() ? url.GetOrigin() : GURL(url.scheme() + ":");
   // Note that we can't unescape spaces here, because if the user copies this
   // and pastes it into another program, that program may think the URL ends at
   // the space.
   return AutocompleteInput::FormattedStringWithEquivalentMeaning(
-      url, url_formatter::FormatUrl(
-               url, languages, url_formatter::kFormatUrlOmitAll,
-               net::UnescapeRule::NORMAL, nullptr, prefix_end, nullptr),
+      url, net::FormatUrl(url, languages, net::kFormatUrlOmitAll,
+                          net::UnescapeRule::NORMAL, NULL, prefix_end, NULL),
       ChromeAutocompleteSchemeClassifier(profile));
 }
 
 base::string16 ToolbarModelImpl::GetCorpusNameForMobile() const {
   if (!WouldPerformSearchTermReplacement(false))
     return base::string16();
   GURL url(GetURL());
   // If there is a query in the url fragment look for the corpus name there,
   // otherwise look for the corpus name in the query parameters.
   const std::string& query_str(google_util::HasGoogleSearchQueryParam(
@@ skipping 156 matching lines @@
 
   // Otherwise, extract search terms for HTTPS pages that do not have a security
   // error.
   connection_security::SecurityLevel security_level =
       GetSecurityLevel(ignore_editing);
   return ((security_level == connection_security::NONE) ||
           (security_level == connection_security::SECURITY_ERROR))
              ? base::string16()
              : search_terms;
 }