| Index: chrome/browser/errorpage_browsertest.cc
|
| diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc
|
| index 1b8a54f72dd1a61aa3e598a8b4d002b5fa988ca9..824514c53d0b5c871ed307244523350f654e2e2f 100644
|
| --- a/chrome/browser/errorpage_browsertest.cc
|
| +++ b/chrome/browser/errorpage_browsertest.cc
|
| @@ -139,7 +139,8 @@ 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.
|
| -IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_DNSError_GoBack2) {
|
| +// Disabled: http://crbug.com/136310
|
| +IN_PROC_BROWSER_TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2) {
|
| NavigateToFileURL(FILE_PATH_LITERAL("title2.html"));
|
|
|
| NavigateToURLAndWaitForTitle(GetDnsErrorURL(), "Mock Link Doctor", 2);
|
| @@ -157,7 +158,8 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_DNSError_GoBack2) {
|
| #endif
|
| // Test that a DNS error occuring in the main frame does not result in an
|
| // additional session history entry.
|
| -IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_DNSError_GoBack2AndForward) {
|
| +// Disabled: http://crbug.com/136310
|
| +IN_PROC_BROWSER_TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2AndForward) {
|
| NavigateToFileURL(FILE_PATH_LITERAL("title2.html"));
|
|
|
| NavigateToURLAndWaitForTitle(GetDnsErrorURL(), "Mock Link Doctor", 2);
|
| @@ -177,7 +179,8 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_DNSError_GoBack2AndForward) {
|
| #endif
|
| // Test that a DNS error occuring in the main frame does not result in an
|
| // additional session history entry.
|
| -IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_DNSError_GoBack2Forward2) {
|
| +// Disabled: http://crbug.com/136310
|
| +IN_PROC_BROWSER_TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2Forward2) {
|
| NavigateToFileURL(FILE_PATH_LITERAL("title3.html"));
|
|
|
| NavigateToURLAndWaitForTitle(GetDnsErrorURL(), "Mock Link Doctor", 2);
|
|
|