Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <deque> | 5 #include <deque> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| 11 #include "base/test/test_timeouts.h" | 11 #include "base/test/test_timeouts.h" |
| 12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 13 #include "base/values.h" | 13 #include "base/values.h" |
| 14 #include "chrome/browser/browsing_data_helper.h" | 14 #include "chrome/browser/browsing_data_helper.h" |
| 15 #include "chrome/browser/browsing_data_remover.h" | 15 #include "chrome/browser/browsing_data_remover.h" |
| 16 #include "chrome/browser/content_settings/host_content_settings_map.h" | 16 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 17 #include "chrome/browser/favicon/favicon_tab_helper.h" | 17 #include "chrome/browser/favicon/favicon_tab_helper.h" |
| 18 #include "chrome/browser/prefs/pref_service.h" | 18 #include "chrome/browser/prefs/pref_service.h" |
| 19 #include "chrome/browser/prerender/prerender_contents.h" | 19 #include "chrome/browser/prerender/prerender_contents.h" |
| 20 #include "chrome/browser/prerender/prerender_handle.h" | |
| 20 #include "chrome/browser/prerender/prerender_link_manager.h" | 21 #include "chrome/browser/prerender/prerender_link_manager.h" |
| 21 #include "chrome/browser/prerender/prerender_link_manager_factory.h" | 22 #include "chrome/browser/prerender/prerender_link_manager_factory.h" |
| 22 #include "chrome/browser/prerender/prerender_manager.h" | 23 #include "chrome/browser/prerender/prerender_manager.h" |
| 23 #include "chrome/browser/prerender/prerender_manager_factory.h" | 24 #include "chrome/browser/prerender/prerender_manager_factory.h" |
| 24 #include "chrome/browser/profiles/profile.h" | 25 #include "chrome/browser/profiles/profile.h" |
| 25 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 26 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 26 #include "chrome/browser/task_manager/task_manager.h" | 27 #include "chrome/browser/task_manager/task_manager.h" |
| 27 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" | 28 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
| 28 #include "chrome/browser/ui/browser.h" | 29 #include "chrome/browser/ui/browser.h" |
| 29 #include "chrome/browser/ui/browser_commands.h" | 30 #include "chrome/browser/ui/browser_commands.h" |
| 30 #include "chrome/browser/ui/browser_finder.h" | 31 #include "chrome/browser/ui/browser_finder.h" |
| 31 #include "chrome/browser/ui/browser_tabstrip.h" | 32 #include "chrome/browser/ui/browser_tabstrip.h" |
| 32 #include "chrome/browser/ui/browser_window.h" | 33 #include "chrome/browser/ui/browser_window.h" |
| 34 #include "chrome/browser/ui/tabs/tab_strip_model.h" | |
| 33 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 35 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
| 34 #include "chrome/common/chrome_notification_types.h" | 36 #include "chrome/common/chrome_notification_types.h" |
| 35 #include "chrome/common/chrome_paths.h" | 37 #include "chrome/common/chrome_paths.h" |
| 36 #include "chrome/common/chrome_switches.h" | 38 #include "chrome/common/chrome_switches.h" |
| 37 #include "chrome/common/pref_names.h" | 39 #include "chrome/common/pref_names.h" |
| 38 #include "chrome/test/base/in_process_browser_test.h" | 40 #include "chrome/test/base/in_process_browser_test.h" |
| 39 #include "chrome/test/base/ui_test_utils.h" | 41 #include "chrome/test/base/ui_test_utils.h" |
| 40 #include "content/public/browser/devtools_agent_host_registry.h" | 42 #include "content/public/browser/devtools_agent_host_registry.h" |
| 41 #include "content/public/browser/devtools_client_host.h" | 43 #include "content/public/browser/devtools_client_host.h" |
| 42 #include "content/public/browser/devtools_manager.h" | 44 #include "content/public/browser/devtools_manager.h" |
| 43 #include "content/public/browser/notification_service.h" | 45 #include "content/public/browser/notification_service.h" |
| 44 #include "content/public/browser/render_view_host.h" | 46 #include "content/public/browser/render_view_host.h" |
| 45 #include "content/public/browser/web_contents.h" | 47 #include "content/public/browser/web_contents.h" |
| 46 #include "content/public/common/url_constants.h" | 48 #include "content/public/common/url_constants.h" |
| 47 #include "grit/generated_resources.h" | 49 #include "grit/generated_resources.h" |
| 48 #include "net/base/mock_host_resolver.h" | 50 #include "net/base/mock_host_resolver.h" |
| 49 #include "net/url_request/url_request_context.h" | 51 #include "net/url_request/url_request_context.h" |
| 50 #include "net/url_request/url_request_context_getter.h" | 52 #include "net/url_request/url_request_context_getter.h" |
| 51 #include "ui/base/l10n/l10n_util.h" | 53 #include "ui/base/l10n/l10n_util.h" |
| 54 #include "content/public/test/test_navigation_observer.h" | |
| 52 | 55 |
| 53 using content::BrowserThread; | 56 using content::BrowserThread; |
| 54 using content::DevToolsAgentHost; | 57 using content::DevToolsAgentHost; |
| 55 using content::DevToolsAgentHostRegistry; | 58 using content::DevToolsAgentHostRegistry; |
| 56 using content::DevToolsClientHost; | 59 using content::DevToolsClientHost; |
| 57 using content::DevToolsManager; | 60 using content::DevToolsManager; |
| 58 using content::NavigationController; | 61 using content::NavigationController; |
| 59 using content::OpenURLParams; | 62 using content::OpenURLParams; |
| 60 using content::Referrer; | 63 using content::Referrer; |
| 61 using content::RenderViewHost; | 64 using content::RenderViewHost; |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 104 prerender_manager->CancelAllPrerenders(); | 107 prerender_manager->CancelAllPrerenders(); |
| 105 } | 108 } |
| 106 | 109 |
| 107 // Returns true if and only if the final status is one in which the prerendered | 110 // Returns true if and only if the final status is one in which the prerendered |
| 108 // page should prerender correctly. The page still may not be used. | 111 // page should prerender correctly. The page still may not be used. |
| 109 bool ShouldRenderPrerenderedPageCorrectly(FinalStatus status) { | 112 bool ShouldRenderPrerenderedPageCorrectly(FinalStatus status) { |
| 110 switch (status) { | 113 switch (status) { |
| 111 case FINAL_STATUS_USED: | 114 case FINAL_STATUS_USED: |
| 112 case FINAL_STATUS_WINDOW_OPENER: | 115 case FINAL_STATUS_WINDOW_OPENER: |
| 113 case FINAL_STATUS_APP_TERMINATING: | 116 case FINAL_STATUS_APP_TERMINATING: |
| 114 case FINAL_STATUS_FRAGMENT_MISMATCH: | |
| 115 case FINAL_STATUS_CACHE_OR_HISTORY_CLEARED: | 117 case FINAL_STATUS_CACHE_OR_HISTORY_CLEARED: |
| 116 // We'll crash the renderer after it's loaded. | 118 // We'll crash the renderer after it's loaded. |
| 117 case FINAL_STATUS_RENDERER_CRASHED: | 119 case FINAL_STATUS_RENDERER_CRASHED: |
| 118 case FINAL_STATUS_CANCELLED: | 120 case FINAL_STATUS_CANCELLED: |
| 119 case FINAL_STATUS_DEVTOOLS_ATTACHED: | 121 case FINAL_STATUS_DEVTOOLS_ATTACHED: |
| 120 case FINAL_STATUS_SESSION_STORAGE_NAMESPACE_MISMATCH: | |
| 121 return true; | 122 return true; |
| 122 default: | 123 default: |
| 123 return false; | 124 return false; |
| 124 } | 125 } |
| 125 } | 126 } |
| 126 | 127 |
| 127 // PrerenderContents that stops the UI message loop on DidStopLoading(). | 128 // PrerenderContents that stops the UI message loop on DidStopLoading(). |
| 128 class TestPrerenderContents : public PrerenderContents { | 129 class TestPrerenderContents : public PrerenderContents { |
| 129 public: | 130 public: |
| 130 TestPrerenderContents( | 131 TestPrerenderContents( |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 220 | 221 |
| 221 virtual void DidStopLoading() OVERRIDE { | 222 virtual void DidStopLoading() OVERRIDE { |
| 222 PrerenderContents::DidStopLoading(); | 223 PrerenderContents::DidStopLoading(); |
| 223 ++number_of_loads_; | 224 ++number_of_loads_; |
| 224 if (ShouldRenderPrerenderedPageCorrectly(expected_final_status_) && | 225 if (ShouldRenderPrerenderedPageCorrectly(expected_final_status_) && |
| 225 number_of_loads_ == expected_number_of_loads_) { | 226 number_of_loads_ == expected_number_of_loads_) { |
| 226 MessageLoopForUI::current()->Quit(); | 227 MessageLoopForUI::current()->Quit(); |
| 227 } | 228 } |
| 228 } | 229 } |
| 229 | 230 |
| 230 virtual void AddPendingPrerender(const GURL& url, | 231 virtual void AddPendingPrerender( |
| 231 const content::Referrer& referrer, | 232 const base::WeakPtr<PrerenderHandle> weak_prerender_handle, |
| 232 const gfx::Size& size) OVERRIDE { | 233 const GURL& url, |
| 233 PrerenderContents::AddPendingPrerender(url, referrer, size); | 234 const content::Referrer& referrer, |
| 235 const gfx::Size& size) OVERRIDE { | |
| 236 PrerenderContents::AddPendingPrerender( | |
| 237 weak_prerender_handle, url, referrer, size); | |
| 234 if (expected_pending_prerenders_ > 0 && | 238 if (expected_pending_prerenders_ > 0 && |
| 235 pending_prerender_list()->size() == expected_pending_prerenders_) { | 239 pending_prerender_vector()->size() == expected_pending_prerenders_) { |
|
dominich
2012/07/03 17:08:39
when your variable name includes the type, you're
gavinp
2012/07/03 18:45:41
Done.
mmenke
2012/07/09 18:06:57
Hmm... "content::Referrer& referrer", "const gfx:
| |
| 236 MessageLoop::current()->Quit(); | 240 MessageLoop::current()->Quit(); |
| 237 } | 241 } |
| 238 } | 242 } |
| 239 | 243 |
| 240 virtual WebContents* CreateWebContents( | 244 virtual WebContents* CreateWebContents( |
| 241 content::SessionStorageNamespace* session_storage_namespace) OVERRIDE { | 245 content::SessionStorageNamespace* session_storage_namespace) OVERRIDE { |
| 242 WebContents* web_contents = PrerenderContents::CreateWebContents( | 246 WebContents* web_contents = PrerenderContents::CreateWebContents( |
| 243 session_storage_namespace); | 247 session_storage_namespace); |
| 244 string16 ready_title = ASCIIToUTF16(kReadyTitle); | 248 string16 ready_title = ASCIIToUTF16(kReadyTitle); |
| 245 if (prerender_should_wait_for_ready_title_) | 249 if (prerender_should_wait_for_ready_title_) |
| 246 ready_title_watcher_.reset(new ui_test_utils::TitleWatcher( | 250 ready_title_watcher_.reset(new ui_test_utils::TitleWatcher( |
| 247 web_contents, ready_title)); | 251 web_contents, ready_title)); |
| 248 return web_contents; | 252 return web_contents; |
| 249 } | 253 } |
| 250 | 254 |
| 251 void WaitForPrerenderToHaveReadyTitleIfRequired() { | 255 void WaitForPrerenderToHaveReadyTitleIfRequired() { |
| 252 if (ready_title_watcher_.get()) { | 256 if (ready_title_watcher_.get()) { |
| 253 string16 ready_title = ASCIIToUTF16(kReadyTitle); | 257 string16 ready_title = ASCIIToUTF16(kReadyTitle); |
| 254 ASSERT_EQ(ready_title, ready_title_watcher_->WaitAndGetTitle()); | 258 ASSERT_EQ(ready_title, ready_title_watcher_->WaitAndGetTitle()); |
| 255 } | 259 } |
| 256 } | 260 } |
| 257 | 261 |
| 258 // Waits until the prerender has |expected_pending_prerenders| pending | 262 // Waits until the prerender has |expected_pending_prerenders| pending |
| 259 // prerenders. | 263 // prerenders. |
| 260 void WaitForPendingPrerenders(size_t expected_pending_prerenders) { | 264 void WaitForPendingPrerenders(size_t expected_pending_prerenders) { |
| 261 if (pending_prerender_list()->size() < expected_pending_prerenders) { | 265 if (pending_prerender_vector()->size() < expected_pending_prerenders) { |
| 262 expected_pending_prerenders_ = expected_pending_prerenders; | 266 expected_pending_prerenders_ = expected_pending_prerenders; |
| 263 ui_test_utils::RunMessageLoop(); | 267 ui_test_utils::RunMessageLoop(); |
| 264 expected_pending_prerenders_ = 0; | 268 expected_pending_prerenders_ = 0; |
| 265 } | 269 } |
| 266 | 270 |
| 267 EXPECT_EQ(expected_pending_prerenders, pending_prerender_list()->size()); | 271 EXPECT_EQ(expected_pending_prerenders, pending_prerender_vector()->size()); |
| 272 } | |
| 273 | |
| 274 bool UrlIsPending(const GURL& url) const { | |
| 275 for (std::vector<PendingPrerenderInfo>::const_iterator | |
| 276 it = pending_prerender_vector()->begin(), | |
| 277 end = pending_prerender_vector()->end(); | |
| 278 it != end; | |
| 279 ++it) { | |
| 280 if (it->url == url && it->weak_prerender_handle) { | |
| 281 EXPECT_TRUE(IsPendingEntry(it->weak_prerender_handle)); | |
| 282 EXPECT_TRUE(it->weak_prerender_handle->IsPending()); | |
| 283 return true; | |
| 284 } | |
| 285 } | |
| 286 return false; | |
| 268 } | 287 } |
| 269 | 288 |
| 270 // For tests that open the prerender in a new background tab, the RenderView | 289 // For tests that open the prerender in a new background tab, the RenderView |
| 271 // will not have been made visible when the PrerenderContents is destroyed | 290 // will not have been made visible when the PrerenderContents is destroyed |
| 272 // even though it is used. | 291 // even though it is used. |
| 273 void set_should_be_shown(bool value) { should_be_shown_ = value; } | 292 void set_should_be_shown(bool value) { should_be_shown_ = value; } |
| 274 | 293 |
| 275 int number_of_loads() const { return number_of_loads_; } | 294 int number_of_loads() const { return number_of_loads_; } |
| 276 | 295 |
| 296 FinalStatus expected_final_status() const { return expected_final_status_; } | |
| 297 | |
| 277 private: | 298 private: |
| 278 virtual void OnRenderViewHostCreated( | 299 virtual void OnRenderViewHostCreated( |
| 279 RenderViewHost* new_render_view_host) OVERRIDE { | 300 RenderViewHost* new_render_view_host) OVERRIDE { |
| 280 // Used to make sure the RenderViewHost is hidden and, if used, | 301 // Used to make sure the RenderViewHost is hidden and, if used, |
| 281 // subsequently shown. | 302 // subsequently shown. |
| 282 notification_registrar().Add( | 303 notification_registrar().Add( |
| 283 this, | 304 this, |
| 284 content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED, | 305 content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED, |
| 285 content::Source<RenderWidgetHost>(new_render_view_host)); | 306 content::Source<RenderWidgetHost>(new_render_view_host)); |
| 286 | 307 |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 483 #endif | 504 #endif |
| 484 use_https_src_server_(false), | 505 use_https_src_server_(false), |
| 485 call_javascript_(true), | 506 call_javascript_(true), |
| 486 loader_path_("files/prerender/prerender_loader.html"), | 507 loader_path_("files/prerender/prerender_loader.html"), |
| 487 explicitly_set_browser_(NULL) { | 508 explicitly_set_browser_(NULL) { |
| 488 EnableDOMAutomation(); | 509 EnableDOMAutomation(); |
| 489 } | 510 } |
| 490 | 511 |
| 491 virtual ~PrerenderBrowserTest() {} | 512 virtual ~PrerenderBrowserTest() {} |
| 492 | 513 |
| 514 content::SessionStorageNamespace* GetSessionStorageNamespace() const { | |
| 515 TabContents* tab_contents = | |
| 516 current_browser()->tab_strip_model()->GetActiveTabContents(); | |
| 517 if (!tab_contents) | |
| 518 return NULL; | |
| 519 return tab_contents->web_contents()->GetRenderViewHost()-> | |
| 520 GetSessionStorageNamespace(); | |
| 521 } | |
| 522 | |
| 493 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 523 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
| 494 #if defined(ENABLE_SAFE_BROWSING) | 524 #if defined(ENABLE_SAFE_BROWSING) |
| 495 SafeBrowsingService::RegisterFactory(safe_browsing_factory_.get()); | 525 SafeBrowsingService::RegisterFactory(safe_browsing_factory_.get()); |
| 496 #endif | 526 #endif |
| 497 } | 527 } |
| 498 | 528 |
| 499 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 529 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 500 command_line->AppendSwitchASCII(switches::kPrerenderMode, | 530 command_line->AppendSwitchASCII(switches::kPrerenderMode, |
| 501 switches::kPrerenderModeSwitchValueEnabled); | 531 switches::kPrerenderModeSwitchValueEnabled); |
| 502 #if defined(OS_MACOSX) | 532 #if defined(OS_MACOSX) |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 696 &js_result)); | 726 &js_result)); |
| 697 EXPECT_TRUE(js_result); | 727 EXPECT_TRUE(js_result); |
| 698 } | 728 } |
| 699 | 729 |
| 700 void NavigateToURL(const std::string& dest_html_file) const { | 730 void NavigateToURL(const std::string& dest_html_file) const { |
| 701 GURL dest_url = test_server()->GetURL(dest_html_file); | 731 GURL dest_url = test_server()->GetURL(dest_html_file); |
| 702 NavigateToURLImpl(dest_url, CURRENT_TAB); | 732 NavigateToURLImpl(dest_url, CURRENT_TAB); |
| 703 } | 733 } |
| 704 | 734 |
| 705 bool UrlIsInPrerenderManager(const std::string& html_file) const { | 735 bool UrlIsInPrerenderManager(const std::string& html_file) const { |
| 706 GURL dest_url = test_server()->GetURL(html_file); | 736 return UrlIsInPrerenderManager(test_server()->GetURL(html_file)); |
| 707 return (GetPrerenderManager()->FindEntry(dest_url) != NULL); | |
| 708 } | 737 } |
| 709 | 738 |
| 710 bool UrlIsInPrerenderManager(const GURL& url) { | 739 bool UrlIsInPrerenderManager(const GURL& url) const { |
| 711 return (GetPrerenderManager()->FindEntry(url) != NULL); | 740 return GetPrerenderManager()->FindPrerenderData( |
| 741 url, GetSessionStorageNamespace()) != NULL; | |
| 712 } | 742 } |
| 713 | 743 |
| 714 bool UrlIsPendingInPrerenderManager(const std::string& html_file) const { | 744 bool UrlIsPendingInPrerenderManager(const std::string& html_file) const { |
| 745 TestPrerenderContents* test_prerender_contents = GetPrerenderContents(); | |
| 746 if (!test_prerender_contents) | |
| 747 return false; | |
| 715 GURL dest_url = test_server()->GetURL(html_file); | 748 GURL dest_url = test_server()->GetURL(html_file); |
| 716 return GetPrerenderManager()->IsPendingEntry(dest_url); | 749 return test_prerender_contents->UrlIsPending(dest_url); |
| 717 } | 750 } |
| 718 | 751 |
| 719 void set_use_https_src(bool use_https_src_server) { | 752 void set_use_https_src(bool use_https_src_server) { |
| 720 use_https_src_server_ = use_https_src_server; | 753 use_https_src_server_ = use_https_src_server; |
| 721 } | 754 } |
| 722 | 755 |
| 723 void DisableJavascriptCalls() { | 756 void DisableJavascriptCalls() { |
| 724 call_javascript_ = false; | 757 call_javascript_ = false; |
| 725 } | 758 } |
| 726 | 759 |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 757 return static_cast<int>(history_list->GetSize()); | 790 return static_cast<int>(history_list->GetSize()); |
| 758 } | 791 } |
| 759 | 792 |
| 760 #if defined(ENABLE_SAFE_BROWSING) | 793 #if defined(ENABLE_SAFE_BROWSING) |
| 761 FakeSafeBrowsingService* GetSafeBrowsingService() { | 794 FakeSafeBrowsingService* GetSafeBrowsingService() { |
| 762 return safe_browsing_factory_->most_recent_service(); | 795 return safe_browsing_factory_->most_recent_service(); |
| 763 } | 796 } |
| 764 #endif | 797 #endif |
| 765 | 798 |
| 766 TestPrerenderContents* GetPrerenderContents() const { | 799 TestPrerenderContents* GetPrerenderContents() const { |
| 800 PrerenderHandle::PrerenderData* prerender_data = | |
| 801 GetPrerenderManager()->FindPrerenderData( | |
| 802 dest_url_, GetSessionStorageNamespace()); | |
| 767 return static_cast<TestPrerenderContents*>( | 803 return static_cast<TestPrerenderContents*>( |
| 768 GetPrerenderManager()->FindEntry(dest_url_)); | 804 prerender_data ? prerender_data->contents : NULL); |
| 769 } | 805 } |
| 770 | 806 |
| 771 void set_loader_path(const std::string& path) { | 807 void set_loader_path(const std::string& path) { |
| 772 loader_path_ = path; | 808 loader_path_ = path; |
| 773 } | 809 } |
| 774 | 810 |
| 775 void set_loader_query_and_fragment(const std::string& query_and_fragment) { | 811 void set_loader_query_and_fragment(const std::string& query_and_fragment) { |
| 776 loader_query_and_fragment_ = query_and_fragment; | 812 loader_query_and_fragment_ = query_and_fragment; |
| 777 } | 813 } |
| 778 | 814 |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 875 bool prerender_test_result = false; | 911 bool prerender_test_result = false; |
| 876 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( | 912 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( |
| 877 prerender_contents->GetRenderViewHostMutable(), L"", | 913 prerender_contents->GetRenderViewHostMutable(), L"", |
| 878 L"window.domAutomationController.send(DidPrerenderPass())", | 914 L"window.domAutomationController.send(DidPrerenderPass())", |
| 879 &prerender_test_result)); | 915 &prerender_test_result)); |
| 880 EXPECT_TRUE(prerender_test_result); | 916 EXPECT_TRUE(prerender_test_result); |
| 881 } | 917 } |
| 882 } else { | 918 } else { |
| 883 // In the failure case, we should have removed |dest_url_| from the | 919 // In the failure case, we should have removed |dest_url_| from the |
| 884 // prerender_manager. We ignore dummy PrerenderContents (as indicated | 920 // prerender_manager. We ignore dummy PrerenderContents (as indicated |
| 885 // by not having started). | 921 // by not having started), and PrerenderContents that are expected to |
| 922 // be left in the manager until the test finishes. | |
| 886 EXPECT_TRUE(prerender_contents == NULL || | 923 EXPECT_TRUE(prerender_contents == NULL || |
| 887 !prerender_contents->prerendering_has_started()); | 924 !prerender_contents->prerendering_has_started() || |
| 925 prerender_contents->expected_final_status() == | |
| 926 FINAL_STATUS_MANAGER_SHUTDOWN); | |
| 888 } | 927 } |
| 889 } | 928 } |
| 890 | 929 |
| 891 void NavigateToURLImpl(const GURL& dest_url, | 930 void NavigateToURLImpl(const GURL& dest_url, |
| 892 WindowOpenDisposition disposition) const { | 931 WindowOpenDisposition disposition) const { |
| 893 ASSERT_TRUE(GetPrerenderManager() != NULL); | 932 ASSERT_TRUE(GetPrerenderManager() != NULL); |
| 894 // Make sure in navigating we have a URL to use in the PrerenderManager. | 933 // Make sure in navigating we have a URL to use in the PrerenderManager. |
| 895 ASSERT_TRUE(GetPrerenderContents() != NULL); | 934 ASSERT_TRUE(GetPrerenderContents() != NULL); |
| 896 | 935 |
| 897 // If opening the page in a background tab, it won't be shown when swapped | 936 // If opening the page in a background tab, it won't be shown when swapped |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 946 const { | 985 const { |
| 947 TestPrerenderContents* prerender_contents = GetPrerenderContents(); | 986 TestPrerenderContents* prerender_contents = GetPrerenderContents(); |
| 948 ASSERT_TRUE(prerender_contents != NULL); | 987 ASSERT_TRUE(prerender_contents != NULL); |
| 949 | 988 |
| 950 RenderViewHost* render_view_host = | 989 RenderViewHost* render_view_host = |
| 951 chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(); | 990 chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(); |
| 952 render_view_host->ExecuteJavascriptInWebFrame( | 991 render_view_host->ExecuteJavascriptInWebFrame( |
| 953 string16(), | 992 string16(), |
| 954 ASCIIToUTF16(javascript_function_name)); | 993 ASCIIToUTF16(javascript_function_name)); |
| 955 | 994 |
| 956 // Run message loop until the prerender contents is destroyed. | 995 if (prerender_contents->expected_final_status() != |
| 957 ui_test_utils::RunMessageLoop(); | 996 FINAL_STATUS_APP_TERMINATING) { |
| 997 // Run message loop until the prerender contents is destroyed. | |
| 998 ui_test_utils::RunMessageLoop(); | |
| 999 } else { | |
| 1000 // We don't expect to pick up a running prerender, so instead | |
| 1001 // something else. | |
| 1002 content::TestNavigationObserver observer( | |
| 1003 content::NotificationService::AllSources(), NULL, 1); | |
| 1004 base::RunLoop run_loop; | |
| 1005 observer.WaitForObservation( | |
| 1006 base::Bind(&ui_test_utils::RunThisRunLoop, | |
| 1007 base::Unretained(&run_loop)), | |
| 1008 ui_test_utils::GetQuitTaskForRunLoop(&run_loop)); | |
| 1009 } | |
| 958 } | 1010 } |
| 959 | 1011 |
| 960 WaitForLoadPrerenderContentsFactory* prerender_contents_factory_; | 1012 WaitForLoadPrerenderContentsFactory* prerender_contents_factory_; |
| 961 #if defined(ENABLE_SAFE_BROWSING) | 1013 #if defined(ENABLE_SAFE_BROWSING) |
| 962 scoped_ptr<TestSafeBrowsingServiceFactory> safe_browsing_factory_; | 1014 scoped_ptr<TestSafeBrowsingServiceFactory> safe_browsing_factory_; |
| 963 #endif | 1015 #endif |
| 964 GURL dest_url_; | 1016 GURL dest_url_; |
| 965 bool use_https_src_server_; | 1017 bool use_https_src_server_; |
| 966 bool call_javascript_; | 1018 bool call_javascript_; |
| 967 std::string loader_path_; | 1019 std::string loader_path_; |
| (...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1631 std::string()); | 1683 std::string()); |
| 1632 ui_test_utils::RunMessageLoop(); | 1684 ui_test_utils::RunMessageLoop(); |
| 1633 } | 1685 } |
| 1634 | 1686 |
| 1635 // Checks that we correctly use a prerendered page when navigating to a | 1687 // Checks that we correctly use a prerendered page when navigating to a |
| 1636 // fragment. | 1688 // fragment. |
| 1637 // DISABLED: http://crbug.com/84154 | 1689 // DISABLED: http://crbug.com/84154 |
| 1638 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 1690 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 1639 DISABLED_PrerenderPageNavigateFragment) { | 1691 DISABLED_PrerenderPageNavigateFragment) { |
| 1640 PrerenderTestURL("files/prerender/prerender_fragment.html", | 1692 PrerenderTestURL("files/prerender/prerender_fragment.html", |
| 1641 FINAL_STATUS_FRAGMENT_MISMATCH, | 1693 FINAL_STATUS_APP_TERMINATING, |
| 1642 1); | 1694 1); |
| 1643 NavigateToURL("files/prerender/prerender_fragment.html#fragment"); | 1695 NavigateToURL("files/prerender/prerender_fragment.html#fragment"); |
| 1644 } | 1696 } |
| 1645 | 1697 |
| 1646 // Checks that we correctly use a prerendered page when we prerender a fragment | 1698 // Checks that we correctly use a prerendered page when we prerender a fragment |
| 1647 // but navigate to the main page. | 1699 // but navigate to the main page. |
| 1648 // http://crbug.com/83901 | 1700 // http://crbug.com/83901 |
| 1649 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 1701 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 1650 DISABLED_PrerenderFragmentNavigatePage) { | 1702 DISABLED_PrerenderFragmentNavigatePage) { |
| 1651 PrerenderTestURL("files/prerender/prerender_fragment.html#fragment", | 1703 PrerenderTestURL("files/prerender/prerender_fragment.html#fragment", |
| 1652 FINAL_STATUS_FRAGMENT_MISMATCH, | 1704 FINAL_STATUS_APP_TERMINATING, |
| 1653 1); | 1705 1); |
| 1654 NavigateToURL("files/prerender/prerender_fragment.html"); | 1706 NavigateToURL("files/prerender/prerender_fragment.html"); |
| 1655 } | 1707 } |
| 1656 | 1708 |
| 1657 // Checks that we correctly use a prerendered page when we prerender a fragment | 1709 // Checks that we correctly use a prerendered page when we prerender a fragment |
| 1658 // but navigate to a different fragment on the same page. | 1710 // but navigate to a different fragment on the same page. |
| 1659 // DISABLED: http://crbug.com/84154 | 1711 // DISABLED: http://crbug.com/84154 |
| 1660 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 1712 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 1661 DISABLED_PrerenderFragmentNavigateFragment) { | 1713 DISABLED_PrerenderFragmentNavigateFragment) { |
| 1662 PrerenderTestURL("files/prerender/prerender_fragment.html#other_fragment", | 1714 PrerenderTestURL("files/prerender/prerender_fragment.html#other_fragment", |
| 1663 FINAL_STATUS_FRAGMENT_MISMATCH, | 1715 FINAL_STATUS_APP_TERMINATING, |
| 1664 1); | 1716 1); |
| 1665 NavigateToURL("files/prerender/prerender_fragment.html#fragment"); | 1717 NavigateToURL("files/prerender/prerender_fragment.html#fragment"); |
| 1666 } | 1718 } |
| 1667 | 1719 |
| 1668 // Checks that we correctly use a prerendered page when the page uses a client | 1720 // Checks that we correctly use a prerendered page when the page uses a client |
| 1669 // redirect to refresh from a fragment on the same page. | 1721 // redirect to refresh from a fragment on the same page. |
| 1670 // http://crbug.com/83901 | 1722 // http://crbug.com/83901 |
| 1671 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 1723 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 1672 DISABLED_PrerenderClientRedirectFromFragment) { | 1724 DISABLED_PrerenderClientRedirectFromFragment) { |
| 1673 PrerenderTestURL( | 1725 PrerenderTestURL( |
| 1674 CreateClientRedirect("files/prerender/prerender_fragment.html#fragment"), | 1726 CreateClientRedirect("files/prerender/prerender_fragment.html#fragment"), |
| 1675 FINAL_STATUS_FRAGMENT_MISMATCH, | 1727 FINAL_STATUS_APP_TERMINATING, |
| 1676 2); | 1728 2); |
| 1677 NavigateToURL("files/prerender/prerender_fragment.html"); | 1729 NavigateToURL("files/prerender/prerender_fragment.html"); |
| 1678 } | 1730 } |
| 1679 | 1731 |
| 1680 // Checks that we correctly use a prerendered page when the page uses a client | 1732 // Checks that we correctly use a prerendered page when the page uses a client |
| 1681 // redirect to refresh to a fragment on the same page. | 1733 // redirect to refresh to a fragment on the same page. |
| 1682 // DISABLED: http://crbug.com/84154 | 1734 // DISABLED: http://crbug.com/84154 |
| 1683 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 1735 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 1684 DISABLED_PrerenderClientRedirectToFragment) { | 1736 DISABLED_PrerenderClientRedirectToFragment) { |
| 1685 PrerenderTestURL( | 1737 PrerenderTestURL( |
| 1686 CreateClientRedirect("files/prerender/prerender_fragment.html"), | 1738 CreateClientRedirect("files/prerender/prerender_fragment.html"), |
| 1687 FINAL_STATUS_FRAGMENT_MISMATCH, | 1739 FINAL_STATUS_APP_TERMINATING, |
| 1688 2); | 1740 2); |
| 1689 NavigateToURL("files/prerender/prerender_fragment.html#fragment"); | 1741 NavigateToURL("files/prerender/prerender_fragment.html#fragment"); |
| 1690 } | 1742 } |
| 1691 | 1743 |
| 1692 // Checks that we correctly use a prerendered page when the page uses JS to set | 1744 // Checks that we correctly use a prerendered page when the page uses JS to set |
| 1693 // the window.location.hash to a fragment on the same page. | 1745 // the window.location.hash to a fragment on the same page. |
| 1694 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 1746 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 1695 PrerenderPageChangeFragmentLocationHash) { | 1747 PrerenderPageChangeFragmentLocationHash) { |
| 1696 PrerenderTestURL("files/prerender/prerender_fragment_location_hash.html", | 1748 PrerenderTestURL("files/prerender/prerender_fragment_location_hash.html", |
| 1697 FINAL_STATUS_USED, | 1749 FINAL_STATUS_USED, |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1839 PrerenderTestURL("files/prerender/prerender_print.html", | 1891 PrerenderTestURL("files/prerender/prerender_print.html", |
| 1840 FINAL_STATUS_WINDOW_PRINT, | 1892 FINAL_STATUS_WINDOW_PRINT, |
| 1841 1); | 1893 1); |
| 1842 } | 1894 } |
| 1843 | 1895 |
| 1844 // Checks that if a page is opened in a new window by javascript and both the | 1896 // Checks that if a page is opened in a new window by javascript and both the |
| 1845 // pages are in the same domain, the prerendered page is not used. | 1897 // pages are in the same domain, the prerendered page is not used. |
| 1846 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 1898 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 1847 PrerenderSameDomainWindowOpenerWindowOpen) { | 1899 PrerenderSameDomainWindowOpenerWindowOpen) { |
| 1848 PrerenderTestURL("files/prerender/prerender_page.html", | 1900 PrerenderTestURL("files/prerender/prerender_page.html", |
| 1849 FINAL_STATUS_WINDOW_OPENER, | 1901 FINAL_STATUS_APP_TERMINATING, |
| 1850 1); | 1902 1); |
| 1851 OpenDestURLViaWindowOpen(); | 1903 OpenDestURLViaWindowOpen(); |
| 1852 } | 1904 } |
| 1853 | 1905 |
| 1854 // Checks that if a page is opened due to click on a href with target="_blank" | 1906 // Checks that if a page is opened due to click on a href with target="_blank" |
| 1855 // and both pages are in the same domain the prerendered page is not used. | 1907 // and both pages are in the same domain the prerendered page is not used. |
| 1856 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 1908 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 1857 PrerenderSameDomainWindowOpenerClickTarget) { | 1909 PrerenderSameDomainWindowOpenerClickTarget) { |
| 1858 PrerenderTestURL("files/prerender/prerender_page.html", | 1910 PrerenderTestURL("files/prerender/prerender_page.html", |
| 1859 FINAL_STATUS_WINDOW_OPENER, | 1911 FINAL_STATUS_APP_TERMINATING, |
| 1860 1); | 1912 1); |
| 1861 OpenDestURLViaClickTarget(); | 1913 OpenDestURLViaClickTarget(); |
| 1862 } | 1914 } |
| 1863 | 1915 |
| 1864 // Checks that a top-level page which would normally request an SSL client | 1916 // Checks that a top-level page which would normally request an SSL client |
| 1865 // certificate will never be seen since it's an https top-level resource. | 1917 // certificate will never be seen since it's an https top-level resource. |
| 1866 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLClientCertTopLevel) { | 1918 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLClientCertTopLevel) { |
| 1867 net::TestServer::HTTPSOptions https_options; | 1919 net::TestServer::HTTPSOptions https_options; |
| 1868 https_options.request_client_certificate = true; | 1920 https_options.request_client_certificate = true; |
| 1869 net::TestServer https_server(https_options, | 1921 net::TestServer https_server(https_options, |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2132 PrerenderTestURL("files/prerender/prerender_page_with_link.html", | 2184 PrerenderTestURL("files/prerender/prerender_page_with_link.html", |
| 2133 FINAL_STATUS_USED, | 2185 FINAL_STATUS_USED, |
| 2134 1); | 2186 1); |
| 2135 OpenDestURLViaClick(); | 2187 OpenDestURLViaClick(); |
| 2136 NavigateToNextPageAfterPrerender(); | 2188 NavigateToNextPageAfterPrerender(); |
| 2137 GoBackToPrerender(); | 2189 GoBackToPrerender(); |
| 2138 } | 2190 } |
| 2139 | 2191 |
| 2140 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewWindow) { | 2192 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewWindow) { |
| 2141 PrerenderTestURL("files/prerender/prerender_page_with_link.html", | 2193 PrerenderTestURL("files/prerender/prerender_page_with_link.html", |
| 2142 FINAL_STATUS_SESSION_STORAGE_NAMESPACE_MISMATCH, | 2194 FINAL_STATUS_APP_TERMINATING, |
| 2143 1); | 2195 1); |
| 2144 OpenDestURLViaClickNewWindow(); | 2196 OpenDestURLViaClickNewWindow(); |
| 2145 } | 2197 } |
| 2146 | 2198 |
| 2147 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewForegroundTab) { | 2199 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewForegroundTab) { |
| 2148 PrerenderTestURL("files/prerender/prerender_page_with_link.html", | 2200 PrerenderTestURL("files/prerender/prerender_page_with_link.html", |
| 2149 FINAL_STATUS_SESSION_STORAGE_NAMESPACE_MISMATCH, | 2201 FINAL_STATUS_APP_TERMINATING, |
| 2150 1); | 2202 1); |
| 2151 OpenDestURLViaClickNewForegroundTab(); | 2203 OpenDestURLViaClickNewForegroundTab(); |
| 2152 } | 2204 } |
| 2153 | 2205 |
| 2154 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewBackgroundTab) { | 2206 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewBackgroundTab) { |
| 2155 PrerenderTestURL("files/prerender/prerender_page_with_link.html", | 2207 PrerenderTestURL("files/prerender/prerender_page_with_link.html", |
| 2156 FINAL_STATUS_SESSION_STORAGE_NAMESPACE_MISMATCH, | 2208 FINAL_STATUS_APP_TERMINATING, |
| 2157 1); | 2209 1); |
| 2158 OpenDestURLViaClickNewBackgroundTab(); | 2210 OpenDestURLViaClickNewBackgroundTab(); |
| 2159 } | 2211 } |
| 2160 | 2212 |
| 2161 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 2213 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 2162 NavigateToPrerenderedPageWhenDevToolsAttached) { | 2214 NavigateToPrerenderedPageWhenDevToolsAttached) { |
| 2163 DisableJavascriptCalls(); | 2215 DisableJavascriptCalls(); |
| 2164 WebContents* web_contents = chrome::GetActiveWebContents(current_browser()); | 2216 WebContents* web_contents = chrome::GetActiveWebContents(current_browser()); |
| 2165 DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost( | 2217 DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost( |
| 2166 web_contents->GetRenderViewHost()); | 2218 web_contents->GetRenderViewHost()); |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2251 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLReferrerPolicy) { | 2303 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLReferrerPolicy) { |
| 2252 set_use_https_src(true); | 2304 set_use_https_src(true); |
| 2253 set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html"); | 2305 set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html"); |
| 2254 PrerenderTestURL("files/prerender/prerender_referrer_policy.html", | 2306 PrerenderTestURL("files/prerender/prerender_referrer_policy.html", |
| 2255 FINAL_STATUS_USED, | 2307 FINAL_STATUS_USED, |
| 2256 1); | 2308 1); |
| 2257 NavigateToDestURL(); | 2309 NavigateToDestURL(); |
| 2258 } | 2310 } |
| 2259 | 2311 |
| 2260 } // namespace prerender | 2312 } // namespace prerender |
| OLD | NEW |