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

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 2699933003: Generalize abort tracking to page end state tracking (Closed)
Patch Set: fix histogram typo Created 3 years, 10 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 (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 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(
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, true /* did_commit */, page_load_metrics::ABORT_NONE, 547 dest_url, true /* did_commit */, page_load_metrics::END_NONE,
548 page_load_metrics::UserInitiatedInfo::NotUserInitiated(), 548 page_load_metrics::UserInitiatedInfo::NotUserInitiated(),
549 base::TimeDelta(), page_load_metrics::PageLoadMetadata()); 549 base::TimeDelta(), 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),
(...skipping 3257 matching lines...) Expand 10 before | Expand all | Expand 10 after
3815 browser()->tab_strip_model()->GetActiveWebContents(); 3815 browser()->tab_strip_model()->GetActiveWebContents();
3816 bool display_test_result = false; 3816 bool display_test_result = false;
3817 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, 3817 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents,
3818 "DidDisplayReallyPass()", 3818 "DidDisplayReallyPass()",
3819 &display_test_result)); 3819 &display_test_result));
3820 ASSERT_TRUE(display_test_result); 3820 ASSERT_TRUE(display_test_result);
3821 } 3821 }
3822 #endif // !defined(DISABLE_NACL) 3822 #endif // !defined(DISABLE_NACL)
3823 3823
3824 } // namespace prerender 3824 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698