| 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 12a9d6ca07bf5fce4d53da3e480359062926fb19..5b9137e0ad42bb37e0d8a3b55f9fa18f83677b9d 100644
|
| --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
|
| +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
|
| @@ -1710,7 +1710,8 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBack) {
|
| }
|
|
|
| // Checks that navigating back to a timeout triggers captive portal detection.
|
| -IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBackToTimeout) {
|
| +// Disabled: http://crbug.com/136310
|
| +IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_GoBackToTimeout) {
|
| // Disable captive portal detection so the first navigation doesn't open a
|
| // login tab.
|
| EnableCaptivePortalDetection(browser()->profile(), false);
|
| @@ -1767,7 +1768,8 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBackToTimeout) {
|
| // Checks that reloading a timeout triggers captive portal detection.
|
| // Much like the last test, though the captive portal is disabled before
|
| // the inital navigation, rather than captive portal detection.
|
| -IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, ReloadTimeout) {
|
| +// Disabled: http://crbug.com/136310
|
| +IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_ReloadTimeout) {
|
| URLRequestMockCaptivePortalJobFactory::SetBehindCaptivePortal(false);
|
|
|
| // Do the first navigation while not behind a captive portal.
|
|
|