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

chrome/browser/ui/search/instant_search_prerenderer_unittest.cc

Index: chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
diff --git a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
index 8501ea4e90562bf46ef36321e58abcf9241ec559..b708b85484ac78ac654b761f1156d032ab6d88ef 100644
--- a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
+++ b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
@@ -21,8 +21,10 @@
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_unittest_base.h"
 #include "chrome/browser/search/search.h"
+#include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/instant_types.h"
 #include "chrome/common/render_messages.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "content/public/browser/navigation_controller.h"
@@ -295,7 +297,7 @@ TEST_F(InstantSearchPrerendererTest, CommitQuery) {
   base::string16 query = ASCIIToUTF16("flowers");
   PrerenderSearchQuery(query);
   InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();
-  prerenderer->Commit(query);
+  prerenderer->Commit(query, EmbeddedSearchRequestParams());
   EXPECT_TRUE(MessageWasSent(ChromeViewMsg_SearchBoxSubmit::ID));
 }
 
@@ -493,4 +495,30 @@ TEST_F(TestUsePrerenderPage, ExtractSearchTermsAndUsePrerenderPage) {
   EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL());
   EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
 }
+
+TEST_F(TestUsePrerenderPage, SetEmbeddedSearchRequestParams) {
+  PrerenderSearchQuery(ASCIIToUTF16("foo"));
+  EXPECT_TRUE(browser()->instant_controller());
+
+  // Open a search results page. Query extraction flag is disabled in field
+  // trials. Search results page URL does not contain search terms replacement
+  // key.
+  GURL url("https://www.google.com/url?bar=foo&aqs=chrome...0&ie=utf-8&oq=f");
+  browser()->instant_controller()->OpenInstant(CURRENT_TAB, url);
+  content::MockRenderProcessHost* process =
+      static_cast<content::MockRenderProcessHost*>(
+          prerender_contents()->GetRenderViewHost()->GetProcess());
+  const IPC::Message* message = process->sink().GetFirstMessageMatching(
+      ChromeViewMsg_SearchBoxSubmit::ID);
+  ASSERT_TRUE(message);
+
+  // Verify the IPC message params.
+  Tuple2<base::string16, EmbeddedSearchRequestParams> params;
+  ChromeViewMsg_SearchBoxSubmit::Read(message, &params);
+  EXPECT_EQ("foo", base::UTF16ToASCII(params.a));
+  EXPECT_EQ("f", base::UTF16ToASCII(params.b.original_query));
+  EXPECT_EQ("utf-8", base::UTF16ToASCII(params.b.input_encoding));
+  EXPECT_EQ("", base::UTF16ToASCII(params.b.rlz_parameter_value));
+  EXPECT_EQ("chrome...0", base::UTF16ToASCII(params.b.assisted_query_stats));
+}
 #endif