Chromium Code Reviews| 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..f236bac38caa6882a40b6f0b6456247c71cf838c 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(GetPrerenderDomContentLoadedEventCountForLinkNumber(0), 1); |
|
davidben
2014/02/11 20:18:40
Nit: EXPECT_EQ(1, GetPrerenderblah). The first arg
ksimbili
2014/02/11 21:16:58
Done.
|
| 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(GetPrerenderDomContentLoadedEventCountForLinkNumber(0), 1); |
|
davidben
2014/02/11 20:18:40
Nit: Ditto.
ksimbili
2014/02/11 21:16:58
Done.
|
| EXPECT_TRUE(DidPrerenderPass(prerender->contents()->prerender_contents())); |
| EXPECT_EQ(0, prerender->number_of_loads()); |
| histograms.Fetch(); |