InstantExtended: Bail on TemplateURLs with no espv.

chrome/browser/search_engines/template_url.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_SEARCH_ENGINES_TEMPLATE_URL_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 413 matching lines @@
   base::Time last_modified() const { return data_.last_modified; }
 
   bool created_by_policy() const { return data_.created_by_policy; }
 
   int usage_count() const { return data_.usage_count; }
 
   int prepopulate_id() const { return data_.prepopulate_id; }
 
   const std::string& sync_guid() const { return data_.sync_guid; }
 
+  // TODO(beaudoin): Rename this when renaming HasSearchTermsReplacementKey().
   const std::string& search_terms_replacement_key() const {
     return data_.search_terms_replacement_key;
   }
 
   const TemplateURLRef& url_ref() const { return url_ref_; }
   const TemplateURLRef& suggestions_url_ref() const {
     return suggestions_url_ref_;
   }
   const TemplateURLRef& instant_url_ref() const { return instant_url_ref_; }
 
@@ skipping 35 matching lines @@
   // alternate URL "http://foo/#q={searchTerms}" and search URL
   // "http://foo/?q={searchTerms}", and the URL to be decoded is
   // "http://foo/?q=a#q=b", the alternate URL will match first and the decoded
   // search term will be "b".
   bool ExtractSearchTermsFromURL(const GURL& url, string16* search_terms);
 
   // Returns true if the specified |url| contains the search terms replacement
   // key in either the query or the ref. This method does not verify anything
   // else about the URL. In particular, it does not check that the domain
   // matches that of this TemplateURL.
+  // TODO(beaudoin): Rename this to reflect that it really checks for an
+  // InstantExtended capable URL.
   bool HasSearchTermsReplacementKey(const GURL& url) const;
 
  private:
   friend class TemplateURLService;
 
   void CopyFrom(const TemplateURL& other);
 
   void SetURL(const std::string& url);
   void SetPrepopulateId(int id);
 
   // Resets the keyword if IsGoogleSearchURLWithReplaceableKeyword() or |force|.
   // The |force| parameter is useful when the existing keyword is known to be
   // a placeholder.  The resulting keyword is generated using
   // TemplateURLService::GenerateSearchURL() and
   // TemplateURLService::GenerateKeyword().
   void ResetKeywordIfNecessary(bool force);
 
   Profile* profile_;
   TemplateURLData data_;
   TemplateURLRef url_ref_;
   TemplateURLRef suggestions_url_ref_;
   TemplateURLRef instant_url_ref_;
 
   // TODO(sky): Add date last parsed OSD file.
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURL);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_