| 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,
|
|
|