diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-27 15:46:40 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-27 15:46:40 +0000 |
| commit | d1fda80b9254869bab3ca816c135088c9724970e (patch) | |
| tree | d6d73af2bce1beb5a977063b0e4790fe37ae6e2e /chrome/browser/errorpage_uitest.cc | |
| parent | 07eb0c01b2d522bb12104a1a079ce352b034f6ec (diff) | |
| download | chromium_src-d1fda80b9254869bab3ca816c135088c9724970e.zip chromium_src-d1fda80b9254869bab3ca816c135088c9724970e.tar.gz chromium_src-d1fda80b9254869bab3ca816c135088c9724970e.tar.bz2 | |
Wait correctly for navigations in ErrorPage UI test.
TBR=darin
TEST=none
http://crbug.com/19361
Review URL: http://codereview.chromium.org/173571
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_uitest.cc')
| -rw-r--r-- | chrome/browser/errorpage_uitest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc index c8b54fa..f6e54fb 100644 --- a/chrome/browser/errorpage_uitest.cc +++ b/chrome/browser/errorpage_uitest.cc @@ -37,7 +37,7 @@ TEST_F(ErrorPageTest, DNSError_GoBack1) { GURL test_url(URLRequestFailedDnsJob::kTestUrl); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html")); - NavigateToURL(test_url); + NavigateToURLBlockUntilNavigationsComplete(test_url, 2); EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); GetActiveTab()->GoBack(); @@ -51,7 +51,7 @@ TEST_F(ErrorPageTest, DNSError_GoBack2) { GURL test_url(URLRequestFailedDnsJob::kTestUrl); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html")); - NavigateToURL(test_url); + NavigateToURLBlockUntilNavigationsComplete(test_url, 2); EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title3.html")); @@ -71,7 +71,7 @@ TEST_F(ErrorPageTest, DNSError_GoBack2AndForward) { GURL test_url(URLRequestFailedDnsJob::kTestUrl); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html")); - NavigateToURL(test_url); + NavigateToURLBlockUntilNavigationsComplete(test_url, 2); EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title3.html")); @@ -94,7 +94,7 @@ TEST_F(ErrorPageTest, DNSError_GoBack2Forward2) { GURL test_url(URLRequestFailedDnsJob::kTestUrl); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title3.html")); - NavigateToURL(test_url); + NavigateToURLBlockUntilNavigationsComplete(test_url, 2); EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html")); |