Use IPC to wait for download in DownloadTest.

chrome/browser/browser_encoding_uitest.cc

Index: chrome/browser/browser_encoding_uitest.cc
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc
index 64ef5ea5b29bdfb83de807c2737d8b55e74538f0..33a5b9b6815c3c9464434a44b911ed14e004de50 100644
--- a/chrome/browser/browser_encoding_uitest.cc
+++ b/chrome/browser/browser_encoding_uitest.cc
@@ -149,7 +149,7 @@ TEST_F(BrowserEncodingTest, FLAKY_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);
@@ -286,7 +286,7 @@ TEST_F(BrowserEncodingTest, FLAKY_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);
   }
 }