Remove call to IsInstantExtendedAPIGoogleSearchUrl from ToolbarModel.

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 122 matching lines @@
   // 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;
 
   // 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.
+  // |search_terms| if the pattern does not match. If |need_instant_extended|
+  // is true, then a match will only be returned if the instant extended
+  // parameter is found and non-zero, moreover, the instant extended parameter
+  // must be found in the same region as the search term (the query or the ref).
   bool ExtractSearchTermsFromURL(const GURL& url,
-                                 string16* search_terms) const;
+                                 string16* search_terms,
+                                 bool needs_instant_extended) const;
 
  private:
   friend class TemplateURL;
   FRIEND_TEST_ALL_PREFIXES(TemplateURLTest, SetPrepopulatedAndParse);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLTest, ParseParameterKnown);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLTest, ParseParameterUnknown);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLTest, ParseURLEmpty);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLTest, ParseURLNoTemplateEnd);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLTest, ParseURLNoKnownParameters);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLTest, ParseURLTwoParameters);
@@ skipping 314 matching lines @@
   size_t URLCount() const;
 
   // Gets the search URL at the given index. The alternate URLs, if any, are
   // numbered starting at 0, and the primary search URL follows. This is used
   // to decode the search term given a search URL (see
   // ExtractSearchTermsFromURL()).
   const std::string& GetURL(size_t index) const;
 
   // Use the alternate URLs and the search URL to match the provided |url|
   // and extract |search_terms| from it. Returns false and an empty
-  // |search_terms| if no search terms can be matched. The order in which the
-  // alternate URLs are listed dictates their priority, the URL at index 0
-  // is treated as the highest priority and the primary search URL is treated
-  // as the lowest priority (see GetURL()).  For example, if a TemplateURL has
-  // alternate URL "http://foo/#q={searchTerms}" and search URL
-  // "http://foo/?q={searchTerms}", and the URL to be decoded is
+  // |search_terms| if no search terms can be matched. The method also returns
+  // false if |needs_instant_extended| is true and the query or ref parameter
+  // corresponding to search_terms_replacement_key() is not found or is 0.
+  // The order in which the alternate URLs are listed dictates their priority,
+  // the URL at index 0 is treated as the highest priority and the primary
+  // search URL is treated as the lowest priority (see GetURL()).  For example,
+  // if a TemplateURL has 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);
+  bool ExtractSearchTermsFromURL(const GURL& url,
+                                 string16* search_terms,
+                                 bool needs_instant_extended);
 
  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_