| Index: chrome/browser/ui/toolbar/toolbar_model_impl.cc
|
| diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
|
| index 94f2d727e5a5f6c7ae10536bd28cec726ad17f57..26b240e13e1eaf22c108d4539d1effbafe66a87b 100644
|
| --- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc
|
| +++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
|
| @@ -215,21 +215,20 @@ string16 ToolbarModelImpl::TryToExtractSearchTermsFromURL() const {
|
| const GURL& url = GetURL();
|
| Profile* profile = GetProfile();
|
|
|
| - // Ensure query extraction is enabled and query URL is HTTPS.
|
| + // Ensure instant extended API 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();
|
| + TemplateURL* template_url = template_url_service->GetDefaultSearchProvider();
|
| if (!template_url)
|
| return string16();
|
|
|
| string16 result;
|
| - template_url->ExtractSearchTermsFromURL(url, &result);
|
| + template_url->ExtractSearchTermsFromURL(url, &result, true);
|
| return result;
|
| }
|
|
|
|
|