Use IPC to wait for download in DownloadTest.

chrome/test/ui/ui_test.cc

 // Copyright (c) 2010 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 "chrome/test/ui/ui_test.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #endif
@@ skipping 595 matching lines @@
   scoped_refptr<BrowserProxy> window =
     automation()->GetBrowserWindow(window_index);
   ASSERT_TRUE(window.get());
   scoped_refptr<TabProxy> tab_proxy(window->GetTab(tab_index));
   ASSERT_TRUE(tab_proxy.get());
   EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab_proxy->NavigateToURLBlockUntilNavigationsComplete(
                 url, number_of_navigations)) << url.spec();
 }
 
-bool UITestBase::WaitForDownloadShelfVisible(BrowserProxy* browser) {
-  return WaitForDownloadShelfVisibilityChange(browser, true);
-}
-
-bool UITestBase::WaitForDownloadShelfInvisible(BrowserProxy* browser) {
-  return WaitForDownloadShelfVisibilityChange(browser, false);
-}
-
-bool UITestBase::WaitForDownloadShelfVisibilityChange(BrowserProxy* browser,
-                                                      bool wait_for_open) {
-  const int kCycles = 10;
-  for (int i = 0; i < kCycles; i++) {
-    // Give it a chance to catch up.
-    PlatformThread::Sleep(sleep_timeout_ms() / kCycles);
-
-    bool visible = !wait_for_open;
-    if (!browser->IsShelfVisible(&visible))
-      continue;
-    if (visible == wait_for_open)
-      return true;  // Got the download shelf.
-  }
-  return false;
-}
-
 bool UITestBase::WaitForFindWindowVisibilityChange(BrowserProxy* browser,
                                                    bool wait_for_open) {
   const int kCycles = 10;
   for (int i = 0; i < kCycles; i++) {
     bool visible = false;
     if (!browser->IsFindWindowFullyVisible(&visible))
       return false;  // Some error.
     if (visible == wait_for_open)
       return true;  // Find window visibility change complete.
 
@@ skipping 885 matching lines @@
     set_ui_test_name(ASCIIToWide(test_name));
   }
   UITestBase::SetUp();
   PlatformTest::SetUp();
 }
 
 void UITest::TearDown() {
   UITestBase::TearDown();
   PlatformTest::TearDown();
 }