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

components/omnibox/browser/autocomplete_result.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/omnibox/browser/autocomplete_result.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/omnibox/browser/omnibox_switches.h"
 #include "components/search/search.h"
-#include "components/url_fixer/url_fixer.h"
+#include "components/url_formatter/url_fixer.h"
 
 using metrics::OmniboxEventProto;
 
 namespace {
 
 // This class implements a special version of AutocompleteMatch::MoreRelevant
 // that allows matches of particular types to be demoted in AutocompleteResult.
 class CompareWithDemoteByType {
  public:
   CompareWithDemoteByType(
@@ skipping 211 matching lines @@
       } else {
         DCHECK_NE(metrics::OmniboxInputType::FORCED_QUERY, input.type())
             << debug_info;
         // If the user explicitly typed a scheme, the default match should
         // have the same scheme.
         if ((input.type() == metrics::OmniboxInputType::URL) &&
             input.parts().scheme.is_nonempty()) {
           const std::string& in_scheme = base::UTF16ToUTF8(input.scheme());
           const std::string& dest_scheme =
               default_match_->destination_url.scheme();
-          DCHECK(url_fixer::IsEquivalentScheme(in_scheme, dest_scheme))
+          DCHECK(url_formatter::IsEquivalentScheme(in_scheme, dest_scheme))
               << debug_info;
         }
       }
     }
   }
 
   // Set the alternate nav URL.
   alternate_nav_url_ = (default_match_ == matches_.end()) ?
       GURL() : ComputeAlternateNavUrl(input, *default_match_);
 }
@@ skipping 184 matching lines @@
        i != old_matches.rend() && delta > 0; ++i) {
     if (!HasMatchByDestination(*i, new_matches)) {
       AutocompleteMatch match = *i;
       match.relevance = std::min(max_relevance, match.relevance);
       match.from_previous = true;
       matches_.push_back(match);
       delta--;
     }
   }
 }