Revert of Reduces dependency from AutocompleteMatch to Profile.

chrome/browser/autocomplete/autocomplete_result.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_RESULT_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_RESULT_H_
 
 #include <stddef.h>
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "url/gurl.h"
 
 class AutocompleteInput;
 class AutocompleteProvider;
-class TemplateURLService;
+class Profile;
 
 // All matches from all providers for a particular query.  This also tracks
 // what the default match should be if the user doesn't manually select another
 // match.
 class AutocompleteResult {
  public:
   typedef ACMatches::const_iterator const_iterator;
   typedef ACMatches::iterator iterator;
 
   // The "Selection" struct is the information we need to select the same match
@@ skipping 30 matching lines @@
   // Max number of matches we'll show from the various providers.
   static const size_t kMaxMatches;
 
   AutocompleteResult();
   ~AutocompleteResult();
 
   // Copies matches from |old_matches| to provide a consistant result set. See
   // comments in code for specifics.
   void CopyOldMatches(const AutocompleteInput& input,
                       const AutocompleteResult& old_matches,
-                      TemplateURLService* template_url_service);
+                      Profile* profile);
 
   // Adds a new set of matches to the result set.  Does not re-sort.
   void AppendMatches(const ACMatches& matches);
 
   // Removes duplicates, puts the list in sorted order and culls to leave only
   // the best kMaxMatches matches.  Sets the default match to the best match
   // and updates the alternate nav URL.
-  void SortAndCull(const AutocompleteInput& input,
-                   TemplateURLService* template_url_service);
+  void SortAndCull(const AutocompleteInput& input, Profile* profile);
 
   // Returns true if at least one match was copied from the last result.
   bool HasCopiedMatches() const;
 
   // Vector-style accessors/operators.
   size_t size() const;
   bool empty() const;
   const_iterator begin() const;
   iterator begin();
   const_iterator end() const;
@@ skipping 106 matching lines @@
   // user's local intranet contains site "foo", and the user types "foo", we
   // default to searching for "foo" when the user may have meant to navigate
   // there.  In cases like this, the default match will point to the "search for
   // 'foo'" result, and this will contain "http://foo/".
   GURL alternate_nav_url_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteResult);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_RESULT_H_