Fix another source of flakiness in ErrorPageTest

chrome/browser/errorpage_uitest.cc

Index: chrome/browser/errorpage_uitest.cc
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc
index a976f8feb4be23da77c60a044aa7c561ea564896..54834f13815d26d3c165230263bc3ba09a13f43a 100644
--- a/chrome/browser/errorpage_uitest.cc
+++ b/chrome/browser/errorpage_uitest.cc
@@ -38,8 +38,7 @@ TEST_F(ErrorPageTest, DNSError_Basic) {
   EXPECT_TRUE(WaitForTitleContaining(test_url.host()));
 }
 
-// Flaky, see http://crbug.com/19361 and http://crbug.com/19395.
-TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack1) {
+TEST_F(ErrorPageTest, DNSError_GoBack1) {
   // Test that a DNS error occuring in the main frame does not result in an
   // additional session history entry.
   GURL test_url(URLRequestFailedDnsJob::kTestUrl);
@@ -53,8 +52,7 @@ TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack1) {
   EXPECT_TRUE(WaitForTitleMatching(L"Title Of Awesomeness"));
 }
 
-// Flaky, see http://crbug.com/19361 and http://crbug.com/19395.
-TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2) {
+TEST_F(ErrorPageTest, DNSError_GoBack2) {
   // Test that a DNS error occuring in the main frame does not result in an
   // additional session history entry.
   GURL test_url(URLRequestFailedDnsJob::kTestUrl);
@@ -64,15 +62,14 @@ TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2) {
   EXPECT_TRUE(WaitForTitleContaining(test_url.host()));
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title3.html"));
 
-  GetActiveTab()->GoBack();
+  GetActiveTab()->GoBackBlockUntilNavigationsComplete(2);

[huanr, 2009/08/25 20:54:37]

please add a comment to explain the number of navigation being 2.

   EXPECT_TRUE(WaitForTitleContaining(test_url.host()));
   GetActiveTab()->GoBack();
 
   EXPECT_TRUE(WaitForTitleMatching(L"Title Of Awesomeness"));
 }
 
-// Flaky, see http://crbug.com/19361 and http://crbug.com/19395.
-TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2AndForward) {
+TEST_F(ErrorPageTest, DNSError_GoBack2AndForward) {
   // Test that a DNS error occuring in the main frame does not result in an
   // additional session history entry.
 
@@ -83,16 +80,15 @@ TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2AndForward) {
   EXPECT_TRUE(WaitForTitleContaining(test_url.host()));
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title3.html"));
 
-  GetActiveTab()->GoBack();
+  GetActiveTab()->GoBackBlockUntilNavigationsComplete(2);
   EXPECT_TRUE(WaitForTitleContaining(test_url.host()));
   GetActiveTab()->GoBack();
-  GetActiveTab()->GoForward();
+  GetActiveTab()->GoForwardBlockUntilNavigationsComplete(2);
 
   EXPECT_TRUE(WaitForTitleContaining(test_url.host()));
 }
 
-// Flaky, see http://crbug.com/19361 and http://crbug.com/19395.
-TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2Forward2) {
+TEST_F(ErrorPageTest, DNSError_GoBack2Forward2) {
   // Test that a DNS error occuring in the main frame does not result in an
   // additional session history entry.
 
@@ -103,10 +99,10 @@ TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2Forward2) {
   EXPECT_TRUE(WaitForTitleContaining(test_url.host()));
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html"));
 
-  GetActiveTab()->GoBack();
+  GetActiveTab()->GoBackBlockUntilNavigationsComplete(2);
   EXPECT_TRUE(WaitForTitleContaining(test_url.host()));
   GetActiveTab()->GoBack();
-  GetActiveTab()->GoForward();
+  GetActiveTab()->GoForwardBlockUntilNavigationsComplete(2);
   EXPECT_TRUE(WaitForTitleContaining(test_url.host()));
   GetActiveTab()->GoForward();