Initial implementation of dedupping search provider's URLs.

chrome/browser/autocomplete/autocomplete_match.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_MATCH_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 169 matching lines @@
   // Convenience function to check if |type| is a search (as opposed to a URL or
   // an extension).
   static bool IsSearchType(Type type);
 
   // Copies the destination_url with "www." stripped off to
   // |stripped_destination_url| and also converts https protocol to
   // http.  These two conversions are merely to allow comparisons to
   // 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 |search_provider_url| is not NULL, it is used to normalize
+  // URLs that might have been generated by the default search provider.

[Peter Kasting, 2012/10/19 22:49:33]

We should not pass this in.

If the match has an associated TemplateURL already, then clearly that's the
TemplateURL to use for normalization.  Otherwise, we should use the TemplateURL
machinery to dynamically calculate the matching TemplateURL, if any, for the
destination URL.  (This handles matches from the history providers.)  The result
of this is that we'll de-dupe properly for non-DSPs as well, and the callers
will be insulated from all this complexity to boot.

I don't know whether GetTemplateURL() can be changed to do this -- you'd have to
check the callers to see whether returning a non-NULL template URL for a "URL
from history" result.  My suspicion is that it can, but maybe we don't want to
unless we make it cache the calculation result.

+  // This is in particular important for all URLs with time/position sensitive
+  // CGI params that need to be stripped off.
+  void ComputeStrippedDestinationURL(TemplateURL* search_provider_url);
 
   // 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.
   // the UI should be "in keyword mode", |keyword| will be set to the keyword
   // and |is_keyword_hint| will be set to false.  If this match has a non-NULL
   // |associated_keyword|, i.e. we should show a "Press [tab] to search ___"
   // hint and allow the user to toggle into keyword mode, |keyword| will be set
   // to the associated keyword and |is_keyword_hint| will be set to true.  Note
   // that only one of these states can be in effect at once.  In all other
   // cases, |keyword| will be cleared, even when our member variable |keyword|
@@ skipping 131 matching lines @@
       const string16& text,
       const ACMatchClassifications& classifications) const;
 #endif
 };
 
 typedef AutocompleteMatch::ACMatchClassification ACMatchClassification;
 typedef std::vector<ACMatchClassification> ACMatchClassifications;
 typedef std::vector<AutocompleteMatch> ACMatches;
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_H_