InstantExtended: Bail on TemplateURLs with no espv.

chrome/browser/search_engines/template_url.cc

 // 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.
 
 #include "chrome/browser/search_engines/template_url.h"
 
 #include "base/format_macros.h"
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 450 matching lines @@
 bool TemplateURLRef::HasGoogleBaseURLs() const {
   ParseIfNecessary();
   for (size_t i = 0; i < replacements_.size(); ++i) {
     if ((replacements_[i].type == GOOGLE_BASE_URL) ||
         (replacements_[i].type == GOOGLE_BASE_SUGGEST_URL))
       return true;
   }
   return false;
 }
 
+bool TemplateURLRef::HasGoogleInstantExtendedParam() const {
+  ParseIfNecessary();
+  for (size_t i = 0; i < replacements_.size(); ++i)

[samarth, 2013/01/14 23:37:04]

Braces here please.

[Jered, 2013/01/14 23:57:27]

Done.

+    if (replacements_[i].type == GOOGLE_INSTANT_EXTENDED_ENABLED)
+      return true;
+  return false;
+}
+
 bool TemplateURLRef::ExtractSearchTermsFromURL(const GURL& url,
                                                string16* search_terms) const {
   DCHECK(search_terms);
   search_terms->clear();
 
   ParseIfNecessary();
 
   // We need a search term in the template URL to extract something.
   if (search_term_key_.empty())
     return false;
@@ skipping 313 matching lines @@
     const SearchTermsData& search_terms_data) const {
   return url_ref_.SupportsReplacementUsingTermsData(search_terms_data);
 }
 
 bool TemplateURL::IsGoogleSearchURLWithReplaceableKeyword() const {
   return !IsExtensionKeyword() && url_ref_.HasGoogleBaseURLs() &&
       google_util::IsGoogleHostname(UTF16ToUTF8(data_.keyword()),
                                     google_util::DISALLOW_SUBDOMAIN);
 }
 
+bool TemplateURL::SupportsInstantExtendedParam() const {
+  // TODO: Extend this to support other providers.
+  return instant_url_ref_.HasGoogleInstantExtendedParam();
+}
+
 bool TemplateURL::HasSameKeywordAs(const TemplateURL& other) const {
   return (data_.keyword() == other.data_.keyword()) ||
       (IsGoogleSearchURLWithReplaceableKeyword() &&
        other.IsGoogleSearchURLWithReplaceableKeyword());
 }
 
 std::string TemplateURL::GetExtensionId() const {
   DCHECK(IsExtensionKeyword());
   return GURL(data_.url()).host();
 }
@@ skipping 82 matching lines @@
 }
 
 void TemplateURL::ResetKeywordIfNecessary(bool force) {
   if (IsGoogleSearchURLWithReplaceableKeyword() || force) {
     DCHECK(!IsExtensionKeyword());
     GURL url(TemplateURLService::GenerateSearchURL(this));
     if (url.is_valid())
       data_.SetKeyword(TemplateURLService::GenerateKeyword(url));
   }
 }