diff options
-rw-r--r-- | chrome/browser/captive_portal/captive_portal_browsertest.cc | 6 | ||||
-rw-r--r-- | chrome/browser/errorpage_browsertest.cc | 9 |
2 files changed, 5 insertions, 10 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. diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index 0793ba9..a3e96eb 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -140,8 +140,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, DNSError_GoBack1) { #endif // Test that a DNS error occuring in the main frame does not result in an // additional session history entry. -// Disabled: http://crbug.com/136310 -IN_PROC_BROWSER_TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2) { +IN_PROC_BROWSER_TEST_F(ErrorPageTest, DNSError_GoBack2) { NavigateToFileURL(FILE_PATH_LITERAL("title2.html")); NavigateToURLAndWaitForTitle(GetDnsErrorURL(), "Mock Link Doctor", 2); @@ -159,8 +158,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2) { #endif // Test that a DNS error occuring in the main frame does not result in an // additional session history entry. -// Disabled: http://crbug.com/136310 -IN_PROC_BROWSER_TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2AndForward) { +IN_PROC_BROWSER_TEST_F(ErrorPageTest, DNSError_GoBack2AndForward) { NavigateToFileURL(FILE_PATH_LITERAL("title2.html")); NavigateToURLAndWaitForTitle(GetDnsErrorURL(), "Mock Link Doctor", 2); @@ -180,8 +178,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2AndForward) { #endif // Test that a DNS error occuring in the main frame does not result in an // additional session history entry. -// Disabled: http://crbug.com/136310 -IN_PROC_BROWSER_TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2Forward2) { +IN_PROC_BROWSER_TEST_F(ErrorPageTest, DNSError_GoBack2Forward2) { NavigateToFileURL(FILE_PATH_LITERAL("title3.html")); NavigateToURLAndWaitForTitle(GetDnsErrorURL(), "Mock Link Doctor", 2); |