| 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 a6632d47e3200b6f825ca96c264382e7a232c41b..9fcc6c3685a15db9f4cd153cf209a47782f68444 100644
|
| --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
|
| +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
|
| @@ -1894,10 +1894,19 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest,
|
| GURL(kMockHttpsUrl));
|
| }
|
|
|
| +// Fails on Windows only, mostly on Win7. http://crbug.com/170033
|
| +#if defined(OS_WIN)
|
| +#define MAYBE_NavigateLoadingTabToTimeoutTwoSites \
|
| + DISABLED_NavigateLoadingTabToTimeoutTwoSites
|
| +#else
|
| +#define MAYBE_NavigateLoadingTabToTimeoutTwoSites \
|
| + NavigateLoadingTabToTimeoutTwoSites
|
| +#endif
|
| +
|
| // Checks that captive portal detection triggers correctly when a same-site
|
| // navigation is cancelled by a navigation to another site.
|
| IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest,
|
| - NavigateLoadingTabToTimeoutTwoSites) {
|
| + MAYBE_NavigateLoadingTabToTimeoutTwoSites) {
|
| RunNavigateLoadingTabToTimeoutTest(
|
| browser(),
|
| GURL(kMockHttpsUrl),
|
|
|