| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <deque> | 6 #include <deque> |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <unordered_map> | 9 #include <unordered_map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 534 }; | 534 }; |
| 535 | 535 |
| 536 base::FilePath GetTestPath(const std::string& file_name) { | 536 base::FilePath GetTestPath(const std::string& file_name) { |
| 537 return ui_test_utils::GetTestFilePath( | 537 return ui_test_utils::GetTestFilePath( |
| 538 base::FilePath(FILE_PATH_LITERAL("prerender")), | 538 base::FilePath(FILE_PATH_LITERAL("prerender")), |
| 539 base::FilePath().AppendASCII(file_name)); | 539 base::FilePath().AppendASCII(file_name)); |
| 540 } | 540 } |
| 541 | 541 |
| 542 page_load_metrics::PageLoadExtraInfo GenericPageLoadExtraInfo( | 542 page_load_metrics::PageLoadExtraInfo GenericPageLoadExtraInfo( |
| 543 const GURL& dest_url) { | 543 const GURL& dest_url) { |
| 544 return page_load_metrics::PageLoadExtraInfo( | 544 return page_load_metrics::PageLoadExtraInfo::CreateForTesting( |
| 545 base::TimeDelta(), base::TimeDelta(), false, | 545 dest_url, false /* started_in_foreground */); |
| 546 page_load_metrics::UserInitiatedInfo::BrowserInitiated(), dest_url, | |
| 547 dest_url, true /* did_commit */, page_load_metrics::END_NONE, | |
| 548 page_load_metrics::UserInitiatedInfo::NotUserInitiated(), | |
| 549 base::TimeDelta(), page_load_metrics::PageLoadMetadata()); | |
| 550 } | 546 } |
| 551 | 547 |
| 552 } // namespace | 548 } // namespace |
| 553 | 549 |
| 554 class PrerenderBrowserTest : public test_utils::PrerenderInProcessBrowserTest { | 550 class PrerenderBrowserTest : public test_utils::PrerenderInProcessBrowserTest { |
| 555 public: | 551 public: |
| 556 PrerenderBrowserTest() | 552 PrerenderBrowserTest() |
| 557 : call_javascript_(true), | 553 : call_javascript_(true), |
| 558 check_load_events_(true), | 554 check_load_events_(true), |
| 559 loader_path_("/prerender/prerender_loader.html") {} | 555 loader_path_("/prerender/prerender_loader.html") {} |
| (...skipping 3255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3815 browser()->tab_strip_model()->GetActiveWebContents(); | 3811 browser()->tab_strip_model()->GetActiveWebContents(); |
| 3816 bool display_test_result = false; | 3812 bool display_test_result = false; |
| 3817 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, | 3813 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, |
| 3818 "DidDisplayReallyPass()", | 3814 "DidDisplayReallyPass()", |
| 3819 &display_test_result)); | 3815 &display_test_result)); |
| 3820 ASSERT_TRUE(display_test_result); | 3816 ASSERT_TRUE(display_test_result); |
| 3821 } | 3817 } |
| 3822 #endif // !defined(DISABLE_NACL) | 3818 #endif // !defined(DISABLE_NACL) |
| 3823 | 3819 |
| 3824 } // namespace prerender | 3820 } // namespace prerender |
| OLD | NEW |