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

Unified Diff: chrome/browser/captive_portal/captive_portal_browsertest.cc

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test exclusion. Created 7 years, 2 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
Index: chrome/browser/captive_portal/captive_portal_browsertest.cc
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index d591c36e193ce287652286609557022942f07a90..83f6b876654dc28eb26a048a9d7eabbb565f2a3c 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -946,6 +946,11 @@ CaptivePortalBrowserTest::CaptivePortalBrowserTest() {
}
void CaptivePortalBrowserTest::SetUpOnMainThread() {
+ // Wait for the InstantNTP prerendered contents to load so it doesn't
+ // interfere with the later checks.
+ MultiNavigationObserver navigation_observer;
+ navigation_observer.WaitForNavigations(1);
+
// Enable mock requests.
content::BrowserThread::PostTask(
content::BrowserThread::IO, FROM_HERE,

Powered by Google App Engine
This is Rietveld 408576698