Move download shelf from per-tab to per-window

chrome/test/ui/ui_test.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 "chrome/test/ui/ui_test.h"
 
 #include <set>
 #include <vector>
 
 #include "base/base_switches.h"
@@ skipping 487 matching lines @@
   ASSERT_TRUE(tab_proxy.get());
   if (!tab_proxy.get())
     return;
 
   bool is_timeout = true;
   ASSERT_TRUE(tab_proxy->NavigateToURLWithTimeout(
       url, command_execution_timeout_ms(), &is_timeout)) << url.spec();
   ASSERT_FALSE(is_timeout) << url.spec();
 }
 
-bool UITest::WaitForDownloadShelfVisible(TabProxy* tab) {
+bool UITest::WaitForDownloadShelfVisible(BrowserProxy* browser) {
+  return WaitForDownloadShelfVisibilityChange(browser, true);
+}
+
+bool UITest::WaitForDownloadShelfInvisible(BrowserProxy* browser) {
+  return WaitForDownloadShelfVisibilityChange(browser, false);
+}
+
+bool UITest::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 = false;
-    if (!tab->IsShelfVisible(&visible))
+    bool visible = !wait_for_open;
+    if (!browser->IsShelfVisible(&visible))
       continue;
-    if (visible)
+    if (visible == wait_for_open)
       return true;  // Got the download shelf.
   }
   return false;
 }
 
 // TODO(port): this #if effectively cuts out half of this file on
 // non-Windows platforms, and is a temporary hack to get things
 // building.
 #if defined(OS_WIN)
 bool UITest::WaitForFindWindowVisibilityChange(BrowserProxy* browser,
@@ skipping 341 matching lines @@
 }
 
 bool UITest::EvictFileFromSystemCacheWrapper(const FilePath& path) {
   for (int i = 0; i < 10; i++) {
     if (file_util::EvictFileFromSystemCache(path))
       return true;
     PlatformThread::Sleep(sleep_timeout_ms() / 10);
   }
   return false;
 }