Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Side by Side Diff: chrome/browser/ui/search/instant_search_prerenderer_unittest.cc

Issue 609493002: Propagate the search request params from the browser to the Instant search base page to fix the embe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/search/instant_search_prerenderer.h" 5 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "chrome/browser/prerender/prerender_contents.h" 13 #include "chrome/browser/prerender/prerender_contents.h"
14 #include "chrome/browser/prerender/prerender_handle.h" 14 #include "chrome/browser/prerender/prerender_handle.h"
15 #include "chrome/browser/prerender/prerender_manager.h" 15 #include "chrome/browser/prerender/prerender_manager.h"
16 #include "chrome/browser/prerender/prerender_manager_factory.h" 16 #include "chrome/browser/prerender/prerender_manager_factory.h"
17 #include "chrome/browser/prerender/prerender_origin.h" 17 #include "chrome/browser/prerender/prerender_origin.h"
18 #include "chrome/browser/prerender/prerender_tab_helper.h" 18 #include "chrome/browser/prerender/prerender_tab_helper.h"
19 #include "chrome/browser/prerender/prerender_tracker.h" 19 #include "chrome/browser/prerender/prerender_tracker.h"
20 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/search/instant_service.h" 21 #include "chrome/browser/search/instant_service.h"
22 #include "chrome/browser/search/instant_unittest_base.h" 22 #include "chrome/browser/search/instant_unittest_base.h"
23 #include "chrome/browser/search/search.h" 23 #include "chrome/browser/search/search.h"
24 #include "chrome/browser/ui/browser_instant_controller.h"
24 #include "chrome/browser/ui/search/search_tab_helper.h" 25 #include "chrome/browser/ui/search/search_tab_helper.h"
25 #include "chrome/browser/ui/tabs/tab_strip_model.h" 26 #include "chrome/browser/ui/tabs/tab_strip_model.h"
27 #include "chrome/common/instant_types.h"
26 #include "chrome/common/render_messages.h" 28 #include "chrome/common/render_messages.h"
27 #include "components/omnibox/autocomplete_match.h" 29 #include "components/omnibox/autocomplete_match.h"
28 #include "content/public/browser/navigation_controller.h" 30 #include "content/public/browser/navigation_controller.h"
29 #include "content/public/browser/web_contents.h" 31 #include "content/public/browser/web_contents.h"
30 #include "content/public/common/url_constants.h" 32 #include "content/public/common/url_constants.h"
31 #include "content/public/test/mock_render_process_host.h" 33 #include "content/public/test/mock_render_process_host.h"
32 #include "ipc/ipc_message.h" 34 #include "ipc/ipc_message.h"
33 #include "ipc/ipc_test_sink.h" 35 #include "ipc/ipc_test_sink.h"
34 #include "ui/gfx/size.h" 36 #include "ui/gfx/size.h"
35 37
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 EXPECT_TRUE(prerenderer->CanCommitQuery(GetActiveWebContents(), 290 EXPECT_TRUE(prerenderer->CanCommitQuery(GetActiveWebContents(),
289 ASCIIToUTF16("joy"))); 291 ASCIIToUTF16("joy")));
290 EXPECT_FALSE(prerenderer->CanCommitQuery(GetActiveWebContents(), 292 EXPECT_FALSE(prerenderer->CanCommitQuery(GetActiveWebContents(),
291 base::string16())); 293 base::string16()));
292 } 294 }
293 295
294 TEST_F(InstantSearchPrerendererTest, CommitQuery) { 296 TEST_F(InstantSearchPrerendererTest, CommitQuery) {
295 base::string16 query = ASCIIToUTF16("flowers"); 297 base::string16 query = ASCIIToUTF16("flowers");
296 PrerenderSearchQuery(query); 298 PrerenderSearchQuery(query);
297 InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer(); 299 InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();
298 prerenderer->Commit(query); 300 prerenderer->Commit(query, EmbeddedSearchRequestParams());
299 EXPECT_TRUE(MessageWasSent(ChromeViewMsg_SearchBoxSubmit::ID)); 301 EXPECT_TRUE(MessageWasSent(ChromeViewMsg_SearchBoxSubmit::ID));
300 } 302 }
301 303
302 TEST_F(InstantSearchPrerendererTest, CancelPrerenderRequestOnTabChangeEvent) { 304 TEST_F(InstantSearchPrerendererTest, CancelPrerenderRequestOnTabChangeEvent) {
303 Init(true, true); 305 Init(true, true);
304 EXPECT_NE(static_cast<PrerenderHandle*>(NULL), prerender_handle()); 306 EXPECT_NE(static_cast<PrerenderHandle*>(NULL), prerender_handle());
305 307
306 // Add a new tab to deactivate the current tab. 308 // Add a new tab to deactivate the current tab.
307 AddTab(browser(), GURL(url::kAboutBlankURL)); 309 AddTab(browser(), GURL(url::kAboutBlankURL));
308 EXPECT_EQ(2, browser()->tab_strip_model()->count()); 310 EXPECT_EQ(2, browser()->tab_strip_model()->count());
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 // trials. Search results page URL does not contain search terms replacement 488 // trials. Search results page URL does not contain search terms replacement
487 // key. Make sure UsePrerenderedPage() extracts the search terms from the URL 489 // key. Make sure UsePrerenderedPage() extracts the search terms from the URL
488 // and uses the prerendered page contents. 490 // and uses the prerendered page contents.
489 GURL url("https://www.google.com/alt#quux=foo"); 491 GURL url("https://www.google.com/alt#quux=foo");
490 browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB, 492 browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
491 ui::PAGE_TRANSITION_TYPED, 493 ui::PAGE_TRANSITION_TYPED,
492 false)); 494 false));
493 EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL()); 495 EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL());
494 EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle()); 496 EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
495 } 497 }
498
499 TEST_F(TestUsePrerenderPage, SetEmbeddedSearchRequestParams) {
500 PrerenderSearchQuery(ASCIIToUTF16("foo"));
501 EXPECT_TRUE(browser()->instant_controller());
502
503 // Open a search results page. Query extraction flag is disabled in field
504 // trials. Search results page URL does not contain search terms replacement
505 // key.
506 GURL url("https://www.google.com/url?bar=foo&aqs=chrome...0&ie=utf-8&oq=f");
507 browser()->instant_controller()->OpenInstant(CURRENT_TAB, url);
508 content::MockRenderProcessHost* process =
509 static_cast<content::MockRenderProcessHost*>(
510 prerender_contents()->GetRenderViewHost()->GetProcess());
511 const IPC::Message* message = process->sink().GetFirstMessageMatching(
512 ChromeViewMsg_SearchBoxSubmit::ID);
513 ASSERT_TRUE(message);
514
515 // Verify the IPC message params.
516 Tuple2<base::string16, EmbeddedSearchRequestParams> params;
517 ChromeViewMsg_SearchBoxSubmit::Read(message, &params);
518 EXPECT_EQ("foo", base::UTF16ToASCII(params.a));
519 EXPECT_EQ("f", base::UTF16ToASCII(params.b.original_query));
520 EXPECT_EQ("utf-8", base::UTF16ToASCII(params.b.input_encoding));
521 EXPECT_EQ("", base::UTF16ToASCII(params.b.rlz_parameter_value));
522 EXPECT_EQ("chrome...0", base::UTF16ToASCII(params.b.assisted_query_stats));
523 }
496 #endif 524 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/instant_search_prerenderer.cc ('k') | chrome/browser/ui/search/search_ipc_router.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698