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 118 matching lines @@
   // the key of the search term, otherwise this returns an empty string.
   const std::string& GetSearchTermKey() const;
 
   // Converts the specified term in our owner's encoding to a string16.
   string16 SearchTermToString16(const std::string& term) const;
 
   // Returns true if this TemplateURLRef has a replacement term of
   // {google:baseURL} or {google:baseSuggestURL}.
   bool HasGoogleBaseURLs() const;
 
+  // Returns true if this TemplateURLRef has a replacement term of
+  // {google:instantExtendedEnabledParameter}.
+  bool HasGoogleInstantExtendedParam() const;

[beaudoin, 2013/01/15 00:34:55]

In the current case you should be able to use
TemplateURLData::search_terms_replacement_key instead of a Google-specific
method. You can probably do something similar to
TemplateURL::HasSearchTermsReplacementKey instead of wrapping out your own.

[Jered, 2013/01/15 19:06:28]

I'm confused. Should supporting search terms replacement be equivalent with
supporting Instant extended? I really want to know if this URL supports the
param that tells the server that Instant Extended should be enabled.

[dhollowa, 2013/01/15 19:18:55]

Yes, this conflation of the two notions of instant-extended-support versus
search-term-replacement is becoming increasingly problematic.  IOS does the
latter but not the former, and my site-isolation work relies on the form but
uses the 'espv' mechanism to signal the former, but is labelled in code as the
latter.

+
   // Use the pattern referred to by this TemplateURLRef to match the provided
   // |url| and extract |search_terms| from it. Returns true if the pattern
   // matches, even if |search_terms| is empty. Returns false and an empty
   // |search_terms| if the pattern does not match.
   bool ExtractSearchTermsFromURL(const GURL& url,
                                  string16* search_terms) const;
 
  private:
   friend class TemplateURL;
   FRIEND_TEST_ALL_PREFIXES(TemplateURLTest, SetPrepopulatedAndParse);
@@ skipping 297 matching lines @@
 
   // Like SupportsReplacement but usable on threads other than the UI thread.
   bool SupportsReplacementUsingTermsData(
       const SearchTermsData& search_terms_data) const;
 
   // Returns true if this TemplateURL uses Google base URLs and has a keyword
   // of "google.TLD".  We use this to decide whether we can automatically
   // update the keyword to reflect the current Google base URL TLD.
   bool IsGoogleSearchURLWithReplaceableKeyword() const;
 
+  // Returns true if the instant_url for this TemplateURL has a replacement for
+  // enabling Instant Extended.
+  bool SupportsInstantExtendedParam() const;
+
   // Returns true if the keywords match or if
   // IsGoogleSearchURLWithReplaceableKeyword() is true for both TemplateURLs.
   bool HasSameKeywordAs(const TemplateURL& other) const;
 
   std::string GetExtensionId() const;
   bool IsExtensionKeyword() const;
 
   // Returns the total number of URLs comprised in this template, including
   // search and alternate URLs.
   size_t URLCount() const;
@@ skipping 42 matching lines @@
   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_