From c90e135d0a9097774779813189f4bcea0f16ce91 Mon Sep 17 00:00:00 2001 From: "bauerb@chromium.org" Date: Fri, 7 May 2010 14:39:56 +0000 Subject: Revert 46681 - Add AutomationMsg_WaitForDownloadShelfVisibilityChange and use it in UITestBase for the download tests. This should decrease flakiness of download tests. TEST=DownloadTest.*, especially DownloadTest.[Dont]CloseNewTab* BUG=43066 Review URL: http://codereview.chromium.org/1933005 TBR=bauerb@chromium.org Review URL: http://codereview.chromium.org/2037003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46685 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/browser_encoding_uitest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/browser_encoding_uitest.cc') diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc index df856c7..3c0531b 100644 --- a/chrome/browser/browser_encoding_uitest.cc +++ b/chrome/browser/browser_encoding_uitest.cc @@ -148,7 +148,7 @@ TEST_F(BrowserEncodingTest, TestOverrideEncoding) { SavePackage::SAVE_AS_COMPLETE_HTML)); scoped_refptr browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); - EXPECT_TRUE(browser->WaitForDownloadShelfVisibilityChange(true)); + EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get())); FilePath expected_file_name = FilePath().AppendASCII(kOverrideTestDir); expected_file_name = expected_file_name.AppendASCII(kExpectedFileName); CheckFile(full_file_name, expected_file_name, true); @@ -284,7 +284,7 @@ TEST_F(BrowserEncodingTest, TestEncodingAutoDetect) { kTestDatas[i].expected_result); EXPECT_TRUE(tab->SavePage(full_saved_file_name, temp_sub_resource_dir_, SavePackage::SAVE_AS_COMPLETE_HTML)); - EXPECT_TRUE(browser->WaitForDownloadShelfVisibilityChange(true)); + EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get())); CheckFile(full_saved_file_name, expected_result_file_name, true); } } -- cgit v1.1