summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_encoding_uitest.cc
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 14:39:56 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 14:39:56 +0000
commitc90e135d0a9097774779813189f4bcea0f16ce91 (patch)
treef96ea8df306d0abaee8adcb8e1d6385a416229d2 /chrome/browser/browser_encoding_uitest.cc
parent55a9a102a879355d95376c28a566e46fbcfe7e65 (diff)
downloadchromium_src-c90e135d0a9097774779813189f4bcea0f16ce91.zip
chromium_src-c90e135d0a9097774779813189f4bcea0f16ce91.tar.gz
chromium_src-c90e135d0a9097774779813189f4bcea0f16ce91.tar.bz2
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
Diffstat (limited to 'chrome/browser/browser_encoding_uitest.cc')
-rw-r--r--chrome/browser/browser_encoding_uitest.cc4
1 files changed, 2 insertions, 2 deletions
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<BrowserProxy> 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);
}
}