Fix another source of flakiness in ErrorPageTest

chrome/browser/errorpage_uitest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/string_util.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/browser/net/url_request_failed_dns_job.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "net/url_request/url_request_unittest.h"
@@ skipping 20 matching lines @@
 };
 
 TEST_F(ErrorPageTest, DNSError_Basic) {
   GURL test_url(URLRequestFailedDnsJob::kTestUrl);
 
   NavigateToURLBlockUntilNavigationsComplete(test_url, 2);
 
   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);
 
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html"));
   NavigateToURL(test_url);
   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_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);
 
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html"));
   NavigateToURL(test_url);
   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.
 
   GURL test_url(URLRequestFailedDnsJob::kTestUrl);
 
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html"));
   NavigateToURL(test_url);
   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.
 
   GURL test_url(URLRequestFailedDnsJob::kTestUrl);
 
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title3.html"));
   NavigateToURL(test_url);
   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();
 
   EXPECT_TRUE(WaitForTitleMatching(L"Title Of Awesomeness"));
 }
 
 TEST_F(ErrorPageTest, IFrameDNSError_Basic) {
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"iframe_dns_error.html"));
   EXPECT_TRUE(WaitForTitleMatching(L"Blah"));
 }
@@ skipping 52 matching lines @@
 
 TEST_F(ErrorPageTest, Page404_GoBack) {
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html"));
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"page404.html"));
   EXPECT_TRUE(WaitForTitleContaining("page404.html"));
 
   GetActiveTab()->GoBack();
 
   EXPECT_TRUE(WaitForTitleMatching(L"Title Of Awesomeness"));
 }