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

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 133073021: Pass DomContentLoaded event from prerenders to launching elements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed davidben comments. Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index f33bd843981afda07759a13310e3b523e9a8f71c..5bf777ccee99a3e777893f6b717fe452f5f39ce3 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -1309,6 +1309,19 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
return load_event_count;
}
+ int GetPrerenderDomContentLoadedEventCountForLinkNumber(int index) const {
+ int dom_content_loaded_event_count;
+ std::string expression = base::StringPrintf(
+ "window.domAutomationController.send("
+ "receivedPrerenderDomContentLoadedEvents[%d] || 0)", index);
+
+ CHECK(content::ExecuteScriptAndExtractInt(
+ GetActiveWebContents(),
+ expression,
+ &dom_content_loaded_event_count));
+ return dom_content_loaded_event_count;
+ }
+
bool DidReceivePrerenderStopEventForLinkNumber(int index) const {
bool received_prerender_stopped;
std::string expression = base::StringPrintf(
@@ -1618,6 +1631,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPage) {
UMAHistogramHelper histograms;
PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
+ EXPECT_EQ(1, GetPrerenderDomContentLoadedEventCountForLinkNumber(0));
histograms.Fetch();
histograms.ExpectTotalCount("Prerender.none_PerceivedPLT", 1);
histograms.ExpectTotalCount("Prerender.none_PerceivedPLTMatched", 0);
@@ -3659,6 +3673,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDeferredImage) {
"files/prerender/prerender_deferred_image.html",
FINAL_STATUS_USED, 0);
WaitForASCIITitle(prerender->contents()->prerender_contents(), kReadyTitle);
+ EXPECT_EQ(1, GetPrerenderDomContentLoadedEventCountForLinkNumber(0));
EXPECT_TRUE(DidPrerenderPass(prerender->contents()->prerender_contents()));
EXPECT_EQ(0, prerender->number_of_loads());
histograms.Fetch();
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698