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

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

Issue 7981033: Deflake PrerenderBrowserTest.PrerenderClientRedirectInIframe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Slightly different solution Created 9 years, 3 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_browsertest.cc
===================================================================
--- chrome/browser/prerender/prerender_browsertest.cc (revision 102206)
+++ chrome/browser/prerender/prerender_browsertest.cc (working copy)
@@ -176,7 +176,7 @@
PrerenderContents::DidStopLoading();
++number_of_loads_;
if (ShouldRenderPrerenderedPageCorrectly(expected_final_status_) &&
- number_of_loads_ >= expected_number_of_loads_) {
+ number_of_loads_ == expected_number_of_loads_) {
MessageLoopForUI::current()->Quit();
}
}
@@ -890,9 +890,7 @@
// Checks that client-issued redirects within an iframe in a prerendered
// page will not count as an "alias" for the prerendered page.
-// Test flaky due to http://crbug.com/88973.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
- FLAKY_PrerenderClientRedirectInIframe) {
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectInIframe) {
std::string redirect_path = CreateClientRedirect(
"/files/prerender/prerender_embedded_content.html");
std::vector<net::TestServer::StringPair> replacement_text;
@@ -903,7 +901,7 @@
"files/prerender/prerender_with_iframe.html",
replacement_text,
&replacement_path));
- PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1);
+ PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 2);
EXPECT_FALSE(UrlIsInPrerenderManager(
"files/prerender/prerender_embedded_content.html"));
NavigateToDestURL();
@@ -927,7 +925,7 @@
"files/prerender/prerender_with_iframe.html",
replacement_text,
&replacement_path));
- PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1);
+ PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 2);
EXPECT_FALSE(UrlIsInPrerenderManager(https_url));
NavigateToDestURL();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698