Propagate the search request params from the browser to the Instant search base page to fix the embe

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/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 

[Mark P, 2014/11/17 19:15:58]

please include instant_types directly.

[kmadhusu, 2014/11/17 22:52:05]

Done.

 
 // Helpers --------------------------------------------------------------------
 
 namespace {
 
 InstantSearchPrerenderer* GetInstantSearchPrerenderer(Profile* profile) {
   DCHECK(profile);
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile);
   return instant_service ? instant_service->instant_search_prerenderer() : NULL;
@@ skipping 29 matching lines @@
       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;
 
   const base::string16& search_terms =
       chrome::ExtractSearchTermsFromURL(profile(), url);
+  EmbeddedSearchRequestParams request_params(url);
   if (search_terms.empty())
     return false;
 
   InstantSearchPrerenderer* prerenderer =
       GetInstantSearchPrerenderer(profile());
   if (prerenderer) {
     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);
+      prerenderer->Commit(search_terms, request_params);
       return false;
     } else {
       prerenderer->Cancel();
     }
   }
 
   // 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);
+  return instant_.SubmitQuery(search_terms, request_params);
 }
 
 Profile* BrowserInstantController::profile() const {
   return browser_->profile();
 }
 
 content::WebContents* BrowserInstantController::GetActiveWebContents() const {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
@@ skipping 55 matching lines @@
 
     contents->GetController().Reload(false);
 
     // As the reload was not triggered by the user we don't want to close any
     // infobars. We have to tell the InfoBarService after the reload, otherwise
     // it would ignore this call when
     // WebContentsObserver::DidStartNavigationToPendingEntry is invoked.
     InfoBarService::FromWebContents(contents)->set_ignore_next_reload();
   }
 }