| 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 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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( |
| 545 base::TimeDelta(), base::TimeDelta(), false, | 545 base::TimeDelta(), base::TimeDelta(), false, |
| 546 page_load_metrics::UserInitiatedInfo::BrowserInitiated(), dest_url, | 546 page_load_metrics::UserInitiatedInfo::BrowserInitiated(), dest_url, |
| 547 dest_url, page_load_metrics::ABORT_NONE, | 547 dest_url, page_load_metrics::ABORT_NONE, |
| 548 page_load_metrics::UserInitiatedInfo::NotUserInitiated(), | 548 page_load_metrics::UserInitiatedInfo::NotUserInitiated(), |
| 549 base::TimeDelta(), 0, 0, page_load_metrics::PageLoadMetadata()); | 549 base::TimeDelta(), 0, 0, 0, 0, page_load_metrics::PageLoadMetadata()); |
| 550 } | 550 } |
| 551 | 551 |
| 552 } // namespace | 552 } // namespace |
| 553 | 553 |
| 554 class PrerenderBrowserTest : public test_utils::PrerenderInProcessBrowserTest { | 554 class PrerenderBrowserTest : public test_utils::PrerenderInProcessBrowserTest { |
| 555 public: | 555 public: |
| 556 PrerenderBrowserTest() | 556 PrerenderBrowserTest() |
| 557 : call_javascript_(true), | 557 : call_javascript_(true), |
| 558 check_load_events_(true), | 558 check_load_events_(true), |
| 559 loader_path_("/prerender/prerender_loader.html") {} | 559 loader_path_("/prerender/prerender_loader.html") {} |
| (...skipping 3197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3757 browser()->tab_strip_model()->GetActiveWebContents(); | 3757 browser()->tab_strip_model()->GetActiveWebContents(); |
| 3758 bool display_test_result = false; | 3758 bool display_test_result = false; |
| 3759 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, | 3759 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, |
| 3760 "DidDisplayReallyPass()", | 3760 "DidDisplayReallyPass()", |
| 3761 &display_test_result)); | 3761 &display_test_result)); |
| 3762 ASSERT_TRUE(display_test_result); | 3762 ASSERT_TRUE(display_test_result); |
| 3763 } | 3763 } |
| 3764 #endif // !defined(DISABLE_NACL) | 3764 #endif // !defined(DISABLE_NACL) |
| 3765 | 3765 |
| 3766 } // namespace prerender | 3766 } // namespace prerender |
| OLD | NEW |