Revert of Reduces dependency from AutocompleteMatch to Profile.

chrome/browser/autocomplete/autocomplete_result.cc

Index: chrome/browser/autocomplete/autocomplete_result.cc
diff --git a/chrome/browser/autocomplete/autocomplete_result.cc b/chrome/browser/autocomplete/autocomplete_result.cc
index 664384b1624ed159fc9725c13c5ee9f15976f479..7c817a037f742b3f22ca8106a39a072d4bc61b27 100644
--- a/chrome/browser/autocomplete/autocomplete_result.cc
+++ b/chrome/browser/autocomplete/autocomplete_result.cc
@@ -132,10 +132,9 @@
 
 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;
 
@@ -171,7 +170,7 @@
                            i->second, matches_per_provider[i->first]);
   }
 
-  SortAndCull(input, template_url_service);
+  SortAndCull(input, profile);
 }
 
 void AutocompleteResult::AppendMatches(const ACMatches& matches) {
@@ -187,11 +186,10 @@
   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_);