Revert of Reduces dependency from AutocompleteMatch to Profile.

chrome/browser/autocomplete/autocomplete_result.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 "chrome/browser/autocomplete/autocomplete_result.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
@@ skipping 114 matching lines @@
   matches_.reserve(kMaxMatches);
 
   // It's probably safe to do this in the initializer list, but there's little
   // penalty to doing it here and it ensures our object is fully constructed
   // before calling member functions.
   default_match_ = end();
 }
 
 AutocompleteResult::~AutocompleteResult() {}
 
-void AutocompleteResult::CopyOldMatches(
-    const AutocompleteInput& input,
-    const AutocompleteResult& old_matches,
-    TemplateURLService* template_url_service) {
+void AutocompleteResult::CopyOldMatches(const AutocompleteInput& input,
+                                        const AutocompleteResult& old_matches,
+                                        Profile* profile) {
   if (old_matches.empty())
     return;
 
   if (empty()) {
     // If we've got no matches we can copy everything from the last result.
     CopyFrom(old_matches);
     for (ACMatches::iterator i(begin()); i != end(); ++i)
       i->from_previous = true;
     return;
   }
@@ skipping 15 matching lines @@
   // anything permanently.
   ProviderToMatches matches_per_provider, old_matches_per_provider;
   BuildProviderToMatches(&matches_per_provider);
   old_matches.BuildProviderToMatches(&old_matches_per_provider);
   for (ProviderToMatches::const_iterator i(old_matches_per_provider.begin());
        i != old_matches_per_provider.end(); ++i) {
     MergeMatchesByProvider(input.current_page_classification(),
                            i->second, matches_per_provider[i->first]);
   }
 
-  SortAndCull(input, template_url_service);
+  SortAndCull(input, profile);
 }
 
 void AutocompleteResult::AppendMatches(const ACMatches& matches) {
 #ifndef NDEBUG
   for (ACMatches::const_iterator i(matches.begin()); i != matches.end(); ++i) {
     DCHECK_EQ(AutocompleteMatch::SanitizeString(i->contents), i->contents);
     DCHECK_EQ(AutocompleteMatch::SanitizeString(i->description),
               i->description);
   }
 #endif
   std::copy(matches.begin(), matches.end(), std::back_inserter(matches_));
   default_match_ = end();
   alternate_nav_url_ = GURL();
 }
 
-void AutocompleteResult::SortAndCull(
-    const AutocompleteInput& input,
-    TemplateURLService* template_url_service) {
+void AutocompleteResult::SortAndCull(const AutocompleteInput& input,
+                                     Profile* profile) {
   for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i)
-    i->ComputeStrippedDestinationURL(template_url_service);
+    i->ComputeStrippedDestinationURL(profile);
 
   DedupMatchesByDestination(input.current_page_classification(), true,
                             &matches_);
 
   // If the result set has at least one legal default match without an inline
   // autocompletion, then in the disable inlining experiment it will be okay
   // to demote all matches with inline autocompletions.  On the other hand, if
   // the experiment is active but there is no legal match without an inline
   // autocompletion, then we'll pretend the experiment is not active and not
   // demote the matches with an inline autocompletion.  In other words, an
@@ skipping 242 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--;
     }
   }
 }