diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 12:42:51 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 12:42:51 +0000 |
| commit | 5ea92a92e9fa26334db821da688d3c46e295d19c (patch) | |
| tree | ac387512f3f23544d62c11c6e95669d5ca158dff /chrome/browser/browser_encoding_uitest.cc | |
| parent | f4db3ef5fe811ed8668a05a7be740a9bb60374ac (diff) | |
| download | chromium_src-5ea92a92e9fa26334db821da688d3c46e295d19c.zip chromium_src-5ea92a92e9fa26334db821da688d3c46e295d19c.tar.gz chromium_src-5ea92a92e9fa26334db821da688d3c46e295d19c.tar.bz2 | |
Reland r46681: Use IPC to wait for download in DownloadTest.
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/2051002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_encoding_uitest.cc')
| -rw-r--r-- | chrome/browser/browser_encoding_uitest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc index 3c0531b..df856c7 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(WaitForDownloadShelfVisible(browser.get())); + EXPECT_TRUE(browser->WaitForDownloadShelfVisibilityChange(true)); 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(WaitForDownloadShelfVisible(browser.get())); + EXPECT_TRUE(browser->WaitForDownloadShelfVisibilityChange(true)); CheckFile(full_saved_file_name, expected_result_file_name, true); } } |