Remove call to IsInstantExtendedAPIGoogleSearchUrl from ToolbarModel.

chrome/browser/ui/toolbar/toolbar_model_impl.cc

 // Copyright 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/ui/toolbar/toolbar_model_impl.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 199 matching lines @@
   WebContents* current_tab = delegate_->GetActiveWebContents();
   return current_tab ? &current_tab->GetController() : NULL;
 }
 
 string16 ToolbarModelImpl::TryToExtractSearchTermsFromURL() const {
   const GURL& url = GetURL();
   Profile* profile = GetProfile();
 
   // Ensure query extraction is enabled and query URL is HTTPS.
   if (!profile || !chrome::search::IsQueryExtractionEnabled(profile) ||
-      !url.SchemeIs(chrome::kHttpsScheme) ||
-      !google_util::IsInstantExtendedAPIGoogleSearchUrl(url.spec()))
+      !url.SchemeIs(chrome::kHttpsScheme))
     return string16();
 
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile);
 
-  TemplateURL *template_url = template_url_service->GetDefaultSearchProvider();
-  if (!template_url)
+  TemplateURL* template_url = template_url_service->GetDefaultSearchProvider();
+  if (!template_url || !template_url->HasSearchTermsReplacementKey(url))
     return string16();
 
   string16 result;
   template_url->ExtractSearchTermsFromURL(url, &result);
   return result;
 }
 
 Profile* ToolbarModelImpl::GetProfile() const {
   NavigationController* navigation_controller = GetNavigationController();
   return navigation_controller ?
       Profile::FromBrowserContext(navigation_controller->GetBrowserContext()) :
       NULL;
 }