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

components/omnibox/browser/history_quick_provider.cc

 // Copyright (c) 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 "components/omnibox/browser/history_quick_provider.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/debug/crash_logging.h"
@@ skipping 10 matching lines @@
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/omnibox/browser/autocomplete_match_type.h"
 #include "components/omnibox/browser/autocomplete_provider_client.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/omnibox/browser/history_url_provider.h"
 #include "components/omnibox/browser/in_memory_url_index.h"
 #include "components/omnibox/browser/in_memory_url_index_types.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
-#include "components/url_formatter/url_formatter.h"
 #include "net/base/escape.h"
+#include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/third_party/mozilla/url_parse.h"
 #include "url/url_util.h"
 
 namespace {
 
 // Used to help investigate bug 464926.  NOTE: This value is defined multiple
 // places in the codebase due to layering issues. DO NOT change the value here
 // without changing it in all other places that it is defined in the codebase
 // (search for |kBug464926CrashKey|).
@@ skipping 171 matching lines @@
   AutocompleteMatch match(
       this, score, !!info.visit_count(),
       history_match.url_matches.empty() ?
           AutocompleteMatchType::HISTORY_TITLE :
           AutocompleteMatchType::HISTORY_URL);
   match.typed_count = info.typed_count();
   match.destination_url = info.url();
   DCHECK(match.destination_url.is_valid());
 
   // Format the URL autocomplete presentation.
-  const url_formatter::FormatUrlTypes format_types =
-      url_formatter::kFormatUrlOmitAll &
-      ~(!history_match.match_in_scheme ? 0 : url_formatter::kFormatUrlOmitHTTP);
+  const net::FormatUrlTypes format_types = net::kFormatUrlOmitAll &
+      ~(!history_match.match_in_scheme ? 0 : net::kFormatUrlOmitHTTP);
   match.fill_into_edit =
       AutocompleteInput::FormattedStringWithEquivalentMeaning(
-          info.url(), url_formatter::FormatUrl(
-                          info.url(), languages_, format_types,
-                          net::UnescapeRule::SPACES, nullptr, nullptr, nullptr),
+          info.url(),
+          net::FormatUrl(info.url(), languages_, format_types,
+                         net::UnescapeRule::SPACES, NULL, NULL, NULL),
           client()->GetSchemeClassifier());
   std::vector<size_t> offsets =
       OffsetsFromTermMatches(history_match.url_matches);
   base::OffsetAdjuster::Adjustments adjustments;
-  match.contents = url_formatter::FormatUrlWithAdjustments(
-      info.url(), languages_, format_types, net::UnescapeRule::SPACES, nullptr,
-      nullptr, &adjustments);
+  match.contents = net::FormatUrlWithAdjustments(
+      info.url(), languages_, format_types, net::UnescapeRule::SPACES, NULL,
+      NULL, &adjustments);
   base::OffsetAdjuster::AdjustOffsets(adjustments, &offsets);
   TermMatches new_matches =
       ReplaceOffsetsInTermMatches(history_match.url_matches, offsets);
   match.contents_class =
       SpansFromTermMatch(new_matches, match.contents.length(), true);
 
   // Set |inline_autocompletion| and |allowed_to_be_default_match| if possible.
   if (history_match.can_inline) {
     base::debug::ScopedCrashKey crash_info(
         kBug464926CrashKey,
@@ skipping 24 matching lines @@
   match.description = info.title();
   match.description_class = SpansFromTermMatch(
       history_match.title_matches, match.description.length(), false);
 
   match.RecordAdditionalInfo("typed count", info.typed_count());
   match.RecordAdditionalInfo("visit count", info.visit_count());
   match.RecordAdditionalInfo("last visit", info.last_visit());
 
   return match;
 }