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

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

Issue 2884293002: Remove unused embeddedSearch.searchBox APIs (Closed)
Patch Set: . Created 3 years, 7 months 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 <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <tuple> 10 #include <tuple>
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 EXPECT_TRUE(prerenderer->CanCommitQuery(GetActiveWebContents(), 296 EXPECT_TRUE(prerenderer->CanCommitQuery(GetActiveWebContents(),
297 ASCIIToUTF16("joy"))); 297 ASCIIToUTF16("joy")));
298 EXPECT_FALSE(prerenderer->CanCommitQuery(GetActiveWebContents(), 298 EXPECT_FALSE(prerenderer->CanCommitQuery(GetActiveWebContents(),
299 base::string16())); 299 base::string16()));
300 } 300 }
301 301
302 TEST_F(InstantSearchPrerendererTest, CommitQuery) { 302 TEST_F(InstantSearchPrerendererTest, CommitQuery) {
303 base::string16 query = ASCIIToUTF16("flowers"); 303 base::string16 query = ASCIIToUTF16("flowers");
304 PrerenderSearchQuery(query); 304 PrerenderSearchQuery(query);
305 InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer(); 305 InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();
306 EXPECT_CALL(*mock_search_box(), Submit(_, _)); 306 EXPECT_CALL(*mock_search_box(), Submit(_));
307 prerenderer->Commit(query, EmbeddedSearchRequestParams()); 307 prerenderer->Commit(EmbeddedSearchRequestParams());
308 } 308 }
309 309
310 TEST_F(InstantSearchPrerendererTest, CancelPrerenderRequestOnTabChangeEvent) { 310 TEST_F(InstantSearchPrerendererTest, CancelPrerenderRequestOnTabChangeEvent) {
311 Init(true, true); 311 Init(true, true);
312 EXPECT_NE(static_cast<PrerenderHandle*>(NULL), prerender_handle()); 312 EXPECT_NE(static_cast<PrerenderHandle*>(NULL), prerender_handle());
313 313
314 // Add a new tab to deactivate the current tab. 314 // Add a new tab to deactivate the current tab.
315 AddTab(browser(), GURL(url::kAboutBlankURL)); 315 AddTab(browser(), GURL(url::kAboutBlankURL));
316 EXPECT_EQ(2, browser()->tab_strip_model()->count()); 316 EXPECT_EQ(2, browser()->tab_strip_model()->count());
317 317
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 ui::PAGE_TRANSITION_LINK, true /* is_renderer_initiated */)); 517 ui::PAGE_TRANSITION_LINK, true /* is_renderer_initiated */));
518 EXPECT_NE(GetPrerenderURL(), GetActiveWebContents()->GetURL()); 518 EXPECT_NE(GetPrerenderURL(), GetActiveWebContents()->GetURL());
519 EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle()); 519 EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
520 } 520 }
521 521
522 TEST_F(TestUsePrerenderPage, SetEmbeddedSearchRequestParams) { 522 TEST_F(TestUsePrerenderPage, SetEmbeddedSearchRequestParams) {
523 PrerenderSearchQuery(ASCIIToUTF16("foo")); 523 PrerenderSearchQuery(ASCIIToUTF16("foo"));
524 EXPECT_TRUE(browser()->instant_controller()); 524 EXPECT_TRUE(browser()->instant_controller());
525 EXPECT_CALL( 525 EXPECT_CALL(
526 *mock_search_box(), 526 *mock_search_box(),
527 Submit(Eq(ASCIIToUTF16("foo")), 527 Submit(AllOf(Field(&EmbeddedSearchRequestParams::original_query,
528 AllOf(Field(&EmbeddedSearchRequestParams::original_query,
529 Eq(base::ASCIIToUTF16("f"))), 528 Eq(base::ASCIIToUTF16("f"))),
530 Field(&EmbeddedSearchRequestParams::input_encoding, 529 Field(&EmbeddedSearchRequestParams::input_encoding,
531 Eq(base::ASCIIToUTF16("utf-8"))), 530 Eq(base::ASCIIToUTF16("utf-8"))),
532 Field(&EmbeddedSearchRequestParams::rlz_parameter_value, 531 Field(&EmbeddedSearchRequestParams::rlz_parameter_value,
533 Eq(base::ASCIIToUTF16(""))), 532 Eq(base::ASCIIToUTF16(""))),
534 Field(&EmbeddedSearchRequestParams::assisted_query_stats, 533 Field(&EmbeddedSearchRequestParams::assisted_query_stats,
535 Eq(base::ASCIIToUTF16("chrome...0")))))); 534 Eq(base::ASCIIToUTF16("chrome...0"))))));
536 535
537 // Open a search results page. Query extraction flag is disabled in field 536 // Open a search results page. Query extraction flag is disabled in field
538 // trials. Search results page URL does not contain search terms replacement 537 // trials. Search results page URL does not contain search terms replacement
539 // key. 538 // key.
540 GURL url("https://www.google.com/url?bar=foo&aqs=chrome...0&ie=utf-8&oq=f"); 539 GURL url("https://www.google.com/url?bar=foo&aqs=chrome...0&ie=utf-8&oq=f");
541 browser()->instant_controller()->OpenInstant( 540 browser()->instant_controller()->OpenInstant(
542 WindowOpenDisposition::CURRENT_TAB, url); 541 WindowOpenDisposition::CURRENT_TAB, url);
543 } 542 }
544 #endif 543 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698