Initial implementation of dedupping search provider's URLs.

chrome/browser/autocomplete/autocomplete_match.h

Index: chrome/browser/autocomplete/autocomplete_match.h
diff --git a/chrome/browser/autocomplete/autocomplete_match.h b/chrome/browser/autocomplete/autocomplete_match.h
index a587df440bb2556731ed51f36b09a33b515253c5..c79e5908154aee46e297d6aa7d0528d470a087b8 100644
--- a/chrome/browser/autocomplete/autocomplete_match.h
+++ b/chrome/browser/autocomplete/autocomplete_match.h
@@ -188,7 +188,10 @@ struct AutocompleteMatch {
   // remove likely duplicates; these URLs are not used as actual
   // destination URLs.  This method is invoked internally by the
   // AutocompleteResult and does not normally need to be invoked.
-  void ComputeStrippedDestinationURL();
+  // If |profile| is not NULL, it is used to get a template URL corresponding
+  // to this match.  The template is used to strip off time/position sensitive
+  // data that would otherwise prevent from proper dedupping.

[Peter Kasting, 2012/10/26 22:13:49]

Nit: dedupping -> deduping (and in other files)

I'd also replace "time/position sensitive data" with "query args other than the
search terms themselves" since that's more accurate (even though the prior
phrase is the core motivation here).

Finally, if we need to pass a Profile here and in GetTemplateURL(), we should
consider simply forcing AutocompleteMatch() to take a Profile* and store it as a
member.  Optionally, perhaps the right fix is to leave these signatures but make
AutocompleteResult take a Profile*?  I'm not sure without trying both.

It would be fine to do this as a follow up.

[Bart N., 2012/10/26 23:36:55]

Done.
Yes, I'll have a follow-up CL to support proper destination URL normalization.
Deferred.

+  void ComputeStrippedDestinationURL(Profile* profile);
 
   // Gets data relevant to whether there should be any special keyword-related
   // UI shown for this match.  If this match represents a selected keyword, i.e.
@@ -217,8 +220,13 @@ struct AutocompleteMatch {
   // Returns the TemplateURL associated with this match.  This may be NULL if
   // the match has no keyword OR if the keyword no longer corresponds to a valid
   // TemplateURL.  See comments on |keyword| below.
+  // Simply delegates to GetTemplateURL(profile, false) below.

[Peter Kasting, 2012/10/26 22:13:49]

Nit: Having two functions here is just another way of writing default arguments,
which are banned by the style guide.  Remove this function and make all callers
use the two-arg form.

[Bart N., 2012/10/26 23:36:55]

Done.

   TemplateURL* GetTemplateURL(Profile* profile) const;
 
+  // Same as above except it may peform additional template lookup using
+  // |destination_url|'s host if |check_host| is true.

[Peter Kasting, 2012/10/26 22:13:49]

Nit: Be more clear.  Something like "If |use_host| is true and the keyword does
not map to a valid TemplateURL, we'll then check for a TemplateURL that
corresponds to the destination_url's hostname."  You may also want to rename the
arg |allow_fallback_to_destination_host| or something.

[Bart N., 2012/10/26 23:36:55]

Done.

+  TemplateURL* GetTemplateURL(Profile* profile, bool use_host) const;
+
   // Adds optional information to the |additional_info| dictionary.
   void RecordAdditionalInfo(const std::string& property,
                             const std::string& value);