Omnibox: Fix URL-What-You-Typed Allowed-To-Be-Default-Match Issues

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 150 matching lines @@
   static base::string16 SanitizeString(const base::string16& text);
 
   // Convenience function to check if |type| is a search (as opposed to a URL or
   // an extension).
   static bool IsSearchType(Type type);
 
   // Convenience function to check if |type| is a special search suggest type -
   // like entity, personalized, profile or postfix.
   static bool IsSpecializedSearchType(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.
-  // If |template_url_service| is not NULL, it is used to get a template URL
-  // corresponding to this match.  The template is used to strip off query args
-  // other than the search terms themselves that would otherwise prevent from
+  // A static version GetTemplateURL() that takes the match's keyword and
+  // match's hostname as parameters.  In short, returns the TemplateURL
+  // associated with |keyword| if it exists; otherwise returns the TemplateURL
+  // associated with |host| if it exists.
+  static TemplateURL* GetTemplateURLWithKeyword(
+      TemplateURLService* template_url_service,
+      const base::string16& keyword,
+      const std::string& host);
+
+  // Returns |url| altered by stripping off "www.", converting https protocol
+  // to http, and stripping excess query parameters.  These conversions are
+  // merely to allow comparisons to remove likely duplicates; these URLs are
+  // not used as actual destination URLs.  If |template_url_service| is not
+  // NULL, it is used to get a template URL corresponding to this match.  If
+  // the match's keyword is known, it can be passed in.  Otherwise, it can be
+  // left empty and the template URL (if any) is determined from the
+  // destination's hostname.  The template URL is used to strip off query args
+  // other than the search terms themselves that would otherwise prevent doing
   // proper deduping.
+  static GURL GURLToStrippedGURL(const GURL& url,
+                                 TemplateURLService* template_url_service,
+                                 const base::string16& keyword);
+
+  // Computes the stripped destination URL (via GURLToStrippedGURL()) and
+  // stores the result in |stripped_destination_url|.
   void ComputeStrippedDestinationURL(TemplateURLService* template_url_service);
 
+  // Sets |allowed_to_be_default_match| to true if this match is effectively
+  // the URL-what-you-typed match (i.e., would be dupped against the UWYT
+  // match when AutocompleteResult merges matches).  |canonical_input_url| is
+  // the AutocompleteInput interpreted as a URL (i.e.,
+  // AutocompleteInput::canonicalized_url()).
+  void EnsureUWYTIsAllowedToBeDefault(const GURL& canonical_input_url,
+                                      TemplateURLService* template_url_service);
+
   // 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|
   // is non-empty -- such as with non-substituting keywords or matches that
@@ skipping 171 matching lines @@
       const base::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_