Create a new helper function to extract search terms from the URL irrespective of the availablility

chrome/browser/ui/browser_instant_controller.cc

Index: chrome/browser/ui/browser_instant_controller.cc
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc
index ddab4540183761035001486542a359c02fcca053..7bac258f309a0ad98324036daf3a8b333ceb763f 100644
--- a/chrome/browser/ui/browser_instant_controller.cc
+++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -73,10 +73,8 @@ bool BrowserInstantController::OpenInstant(WindowOpenDisposition disposition,
   // support for the new disposition.
   DCHECK(disposition == CURRENT_TAB) << disposition;
 
-  // If we will not be replacing search terms from this URL, don't send to
-  // InstantController.
   const base::string16& search_terms =
-      chrome::GetSearchTermsFromURL(browser_->profile(), url);
+      chrome::ExtractSearchTermsFromURL(profile(), url);
   if (search_terms.empty())
     return false;
 
@@ -93,6 +91,11 @@ bool BrowserInstantController::OpenInstant(WindowOpenDisposition disposition,
     }
   }
 
+  // If we will not be replacing search terms from this URL, don't send to
+  // InstantController.
+  if (!chrome::IsQueryExtractionAllowedForURL(profile(), url))
+    return false;
+
   return instant_.SubmitQuery(search_terms);
 }