Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/search/search_tab_helper.h" | 24 #include "chrome/browser/ui/search/search_tab_helper.h" |
| 25 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 25 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 26 #include "chrome/common/instant_types.h" | |
| 26 #include "chrome/common/render_messages.h" | 27 #include "chrome/common/render_messages.h" |
| 27 #include "components/omnibox/autocomplete_match.h" | 28 #include "components/omnibox/autocomplete_match.h" |
| 28 #include "content/public/browser/navigation_controller.h" | 29 #include "content/public/browser/navigation_controller.h" |
| 29 #include "content/public/browser/web_contents.h" | 30 #include "content/public/browser/web_contents.h" |
| 30 #include "content/public/common/url_constants.h" | 31 #include "content/public/common/url_constants.h" |
| 31 #include "content/public/test/mock_render_process_host.h" | 32 #include "content/public/test/mock_render_process_host.h" |
| 32 #include "ipc/ipc_message.h" | 33 #include "ipc/ipc_message.h" |
| 33 #include "ipc/ipc_test_sink.h" | 34 #include "ipc/ipc_test_sink.h" |
| 34 #include "ui/gfx/size.h" | 35 #include "ui/gfx/size.h" |
| 35 | 36 |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 288 EXPECT_TRUE(prerenderer->CanCommitQuery(GetActiveWebContents(), | 289 EXPECT_TRUE(prerenderer->CanCommitQuery(GetActiveWebContents(), |
| 289 ASCIIToUTF16("joy"))); | 290 ASCIIToUTF16("joy"))); |
| 290 EXPECT_FALSE(prerenderer->CanCommitQuery(GetActiveWebContents(), | 291 EXPECT_FALSE(prerenderer->CanCommitQuery(GetActiveWebContents(), |
| 291 base::string16())); | 292 base::string16())); |
| 292 } | 293 } |
| 293 | 294 |
| 294 TEST_F(InstantSearchPrerendererTest, CommitQuery) { | 295 TEST_F(InstantSearchPrerendererTest, CommitQuery) { |
| 295 base::string16 query = ASCIIToUTF16("flowers"); | 296 base::string16 query = ASCIIToUTF16("flowers"); |
| 296 PrerenderSearchQuery(query); | 297 PrerenderSearchQuery(query); |
| 297 InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer(); | 298 InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer(); |
| 298 prerenderer->Commit(query); | 299 prerenderer->Commit(query, EmbeddedSearchRequestParams()); |
| 299 EXPECT_TRUE(MessageWasSent(ChromeViewMsg_SearchBoxSubmit::ID)); | 300 EXPECT_TRUE(MessageWasSent(ChromeViewMsg_SearchBoxSubmit::ID)); |
| 300 } | 301 } |
| 301 | 302 |
| 302 TEST_F(InstantSearchPrerendererTest, CancelPrerenderRequestOnTabChangeEvent) { | 303 TEST_F(InstantSearchPrerendererTest, CancelPrerenderRequestOnTabChangeEvent) { |
| 303 Init(true, true); | 304 Init(true, true); |
| 304 EXPECT_NE(static_cast<PrerenderHandle*>(NULL), prerender_handle()); | 305 EXPECT_NE(static_cast<PrerenderHandle*>(NULL), prerender_handle()); |
| 305 | 306 |
| 306 // Add a new tab to deactivate the current tab. | 307 // Add a new tab to deactivate the current tab. |
| 307 AddTab(browser(), GURL(url::kAboutBlankURL)); | 308 AddTab(browser(), GURL(url::kAboutBlankURL)); |
| 308 EXPECT_EQ(2, browser()->tab_strip_model()->count()); | 309 EXPECT_EQ(2, browser()->tab_strip_model()->count()); |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 486 // trials. Search results page URL does not contain search terms replacement | 487 // trials. Search results page URL does not contain search terms replacement |
| 487 // key. Make sure UsePrerenderedPage() extracts the search terms from the URL | 488 // key. Make sure UsePrerenderedPage() extracts the search terms from the URL |
| 488 // and uses the prerendered page contents. | 489 // and uses the prerendered page contents. |
| 489 GURL url("https://www.google.com/alt#quux=foo"); | 490 GURL url("https://www.google.com/alt#quux=foo"); |
| 490 browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB, | 491 browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB, |
| 491 ui::PAGE_TRANSITION_TYPED, | 492 ui::PAGE_TRANSITION_TYPED, |
| 492 false)); | 493 false)); |
| 493 EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL()); | 494 EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL()); |
| 494 EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle()); | 495 EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle()); |
| 495 } | 496 } |
| 496 #endif | 497 #endif |
|
Mark P
2014/11/17 19:15:58
Would it be hard to add a new test, perhaps in thi
kmadhusu
2014/11/17 22:52:05
Done.
| |
| OLD | NEW |