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

chrome/browser/ui/browser_instant_controller.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/browser_instant_controller.h"
 
 #include "base/bind.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 55 matching lines @@
   // Unsupported dispositions.
   if (disposition == NEW_BACKGROUND_TAB || disposition == NEW_WINDOW ||
       disposition == NEW_FOREGROUND_TAB)
     return false;
 
   // The omnibox currently doesn't use other dispositions, so we don't attempt
   // to handle them. If you hit this DCHECK file a bug and I'll (sky) add
   // 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);
-  if (search_terms.empty())
-    return false;
-
   InstantSearchPrerenderer* prerenderer =
       GetInstantSearchPrerenderer(profile());
   if (prerenderer) {
+    const base::string16& search_terms =
+        prerenderer->GetSearchTermsFromURL(url);
     if (prerenderer->CanCommitQuery(GetActiveWebContents(), search_terms)) {
       // Submit query to render the prefetched results. Browser will swap the
       // prerendered contents with the active tab contents.
       prerenderer->Commit(search_terms);
       return false;
     } else {
       prerenderer->Cancel();
     }
   }
 
+  // If we will not be replacing search terms from this URL, don't send to
+  // InstantController.
+  const base::string16& search_terms =

[Jered, 2014/02/07 03:02:26]

Can we find a way to do this where we don't try to extract search terms twice?
That seems like a bad sign to me. I know the search.cc code around here is messy
but maybe this is a chance to clean it up.

[kmadhusu, 2014/02/11 01:40:02]

Done.

+      chrome::GetSearchTermsFromURL(browser_->profile(), url);
+  if (search_terms.empty())
+    return false;
   return instant_.SubmitQuery(search_terms);
 }
 
 Profile* BrowserInstantController::profile() const {
   return browser_->profile();
 }
 
 content::WebContents* BrowserInstantController::GetActiveWebContents() const {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
@@ skipping 67 matching lines @@
     content::RenderProcessHost* rph = contents->GetRenderProcessHost();
     instant_service->SendSearchURLsToRenderer(rph);
 
     // Reload the contents to ensure that it gets assigned to a non-priviledged
     // renderer.
     if (!instant_service->IsInstantProcess(rph->GetID()))
       continue;
     contents->GetController().Reload(false);
   }
 }