Use IPC to wait for download in DownloadTest.

chrome/browser/browser_encoding_uitest.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include <string>
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/common/pref_names.h"
@@ skipping 131 matching lines @@
   // Dump the page, the content of dump page should be identical to the
   // expected result file.
   FilePath full_file_name = save_dir_.AppendASCII(kTestFileName);
   // We save the page as way of complete HTML file, which requires a directory
   // name to save sub resources in it. Although this test file does not have
   // sub resources, but the directory name is still required.
   EXPECT_TRUE(tab_proxy->SavePage(full_file_name, temp_sub_resource_dir_,
                                   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);
 }
 
 // The following encodings are excluded from the auto-detection test because
 // it's a known issue that the current encoding detector does not detect them:
 // ISO-8859-4
 // ISO-8859-13
 // KOI8-U
@@ skipping 116 matching lines @@
     // result file.
     full_saved_file_name = save_dir_.AppendASCII(kTestDatas[i].test_file_name);
     // Full path of expect result file.
     FilePath expected_result_file_name = FilePath().AppendASCII(kAutoDetectDir);
     expected_result_file_name = expected_result_file_name.AppendASCII(
         kExpectedResultDir);
     expected_result_file_name = expected_result_file_name.AppendASCII(
         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);
   }
 }