diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 22:32:40 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 22:32:40 +0000 |
| commit | eaf4d1f56a699688ec229237697c0edc83dc4425 (patch) | |
| tree | 99635628c61a207391ea4171102ad6fce428a6b9 /chrome/browser/captive_portal | |
| parent | 91854c5ef102d60cac0a203b323bf6718ebed561 (diff) | |
| download | chromium_src-eaf4d1f56a699688ec229237697c0edc83dc4425.zip chromium_src-eaf4d1f56a699688ec229237697c0edc83dc4425.tar.gz chromium_src-eaf4d1f56a699688ec229237697c0edc83dc4425.tar.bz2 | |
Re-enable most of the tests disabled for bug 136310, the
underlying WebKit bug has now been fixed.
MultipartResponseTest.SingleVisit is still disabled, since
it's still failing for some reason.
BUG=136310
Review URL: https://chromiumcodereview.appspot.com/10911187
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/captive_portal')
| -rw-r--r-- | chrome/browser/captive_portal/captive_portal_browsertest.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index b874832..098d169 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -1841,8 +1841,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBack) { } // Checks that navigating back to a timeout triggers captive portal detection. -// Disabled: http://crbug.com/136310 -IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_GoBackToTimeout) { +IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBackToTimeout) { // Disable captive portal detection so the first navigation doesn't open a // login tab. EnableCaptivePortalDetection(browser()->profile(), false); @@ -1900,8 +1899,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_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. -// Disabled: http://crbug.com/136310 -IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_ReloadTimeout) { +IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, ReloadTimeout) { URLRequestMockCaptivePortalJobFactory::SetBehindCaptivePortal(false); // Do the first navigation while not behind a captive portal. |