Move download shelf from per-tab to per-window

chrome/browser/download/download_uitest.cc

 // Copyright (c) 2006-2008 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 <sstream>
 #include <string>
 
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <shlwapi.h>
@@ skipping 113 matching lines @@
 
       // Complete sending the request.  We do this by loading a second URL in a
       // separate tab.
       scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
       EXPECT_TRUE(window->AppendTab(GURL(
           URLRequestSlowDownloadJob::kFinishDownloadUrl)));
       EXPECT_EQ(2, GetTabCount());
       // TODO(tc): check download status text
 
       // Make sure the download shelf is showing.
-      scoped_refptr<TabProxy> dl_tab(window->GetTab(0));
-      ASSERT_TRUE(dl_tab.get());
-      EXPECT_TRUE(WaitForDownloadShelfVisible(dl_tab.get()));
+      EXPECT_TRUE(WaitForDownloadShelfVisible(window.get()));
     }
 
     FilePath filename;
     net::FileURLToFilePath(url, &filename);
     filename = filename.BaseName();
     FilePath download_path = download_prefix_.Append(filename);
     EXPECT_TRUE(file_util::PathExists(download_path));
 
     // Delete the file we just downloaded.
     for (int i = 0; i < 10; ++i) {
@@ skipping 16 matching lines @@
 
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(file.ToWStringHack()));
   // No new tabs created, downloads appear in the current tab's download shelf.
   WaitUntilTabCount(1);
 
   // Wait until the file is downloaded.
   PlatformThread::Sleep(action_timeout_ms());
 
   CleanUpDownload(file);
 
-  scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
-  ASSERT_TRUE(tab_proxy.get());
-  EXPECT_TRUE(WaitForDownloadShelfVisible(tab_proxy.get()));
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  ASSERT_TRUE(browser.get());
+  EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
 }
 
 // Access a file with a viewable mime-type, verify that a download
 // did not initiate.
 TEST_F(DownloadTest, NoDownload) {
   FilePath file(FILE_PATH_LITERAL("download-test2.html"));
   FilePath file_path = download_prefix_.Append(file);
 
   if (file_util::PathExists(file_path))
     ASSERT_TRUE(file_util::Delete(file_path, false));
 
   EXPECT_EQ(1, GetTabCount());
 
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(file.ToWStringHack()));
   WaitUntilTabCount(1);
 
   // Wait to see if the file will be downloaded.
   PlatformThread::Sleep(action_timeout_ms());
 
   EXPECT_FALSE(file_util::PathExists(file_path));
   if (file_util::PathExists(file_path))
     ASSERT_TRUE(file_util::Delete(file_path, false));
 
-  scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
-  ASSERT_TRUE(tab_proxy.get());
-  EXPECT_FALSE(WaitForDownloadShelfVisible(tab_proxy.get()));
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  ASSERT_TRUE(browser.get());
+  EXPECT_FALSE(WaitForDownloadShelfVisible(browser.get()));
 }
 
 // Download a 0-size file with a content-disposition header, verify that the
 // download tab opened and the file exists as the filename specified in the
 // header.  This also ensures we properly handle empty file downloads.
 TEST_F(DownloadTest, ContentDisposition) {
   FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
   FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
 
   EXPECT_EQ(1, GetTabCount());
 
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(file.ToWStringHack()));
   WaitUntilTabCount(1);
 
   // Wait until the file is downloaded.
   PlatformThread::Sleep(action_timeout_ms());
 
   CleanUpDownload(download_file, file);
 
-  // Ensure the download shelf is visible on the current tab.
-  scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
-  ASSERT_TRUE(tab_proxy.get());
-  EXPECT_TRUE(WaitForDownloadShelfVisible(tab_proxy.get()));
+  // Ensure the download shelf is visible on the window.
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  ASSERT_TRUE(browser.get());
+  EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
 }
 
+// Test that the download shelf is per-window by starting a download in one
+// tab, opening a second tab, closing the shelf, going back to the first tab,
+// and checking that the shelf is closed.
+TEST_F(DownloadTest, PerWindowShelf) {
+  FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
+  FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
+
+  EXPECT_EQ(1, GetTabCount());
+
+  NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(file.ToWStringHack()));
+  WaitUntilTabCount(1);
+
+  // Wait until the file is downloaded.
+  PlatformThread::Sleep(action_timeout_ms());
+
+  CleanUpDownload(download_file, file);
+
+  // Ensure the download shelf is visible on the window.
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  ASSERT_TRUE(browser.get());
+  EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
+
+  // Open a second tab
+  browser->AppendTab(GURL(""));
+  WaitUntilTabCount(2);
+
+  // Hide shelf
+  browser->SetShelfVisible(false);
+  EXPECT_TRUE(WaitForDownloadShelfInvisible(browser.get()));
+
+  // Go to first tab
+  EXPECT_TRUE(browser->ActivateTab(0));
+  int tab_count;
+  EXPECT_TRUE(browser->GetTabCount(&tab_count));
+  ASSERT_EQ(2, tab_count);
+
+  bool shelf_visible;
+  EXPECT_TRUE(browser->IsShelfVisible(&shelf_visible));
+  ASSERT_FALSE(shelf_visible);
+}
+
+
 // UnknownSize and KnownSize are tests which depend on
 // URLRequestSlowDownloadJob to serve content in a certain way. Data will be
 // sent in two chunks where the first chunk is 35K and the second chunk is 10K.
 // The test will first attempt to download a file; but the server will "pause"
 // in the middle until the server receives a second request for
 // "download-finish.  At that time, the download will finish.
 TEST_F(DownloadTest, UnknownSize) {
   GURL url(URLRequestSlowDownloadJob::kUnknownSizeUrl);
   FilePath filename;
   net::FileURLToFilePath(url, &filename);
   filename = filename.BaseName();
   RunSizeTest(url, L"32.0 KB - " + filename.ToWStringHack(),
               L"100% - " + filename.ToWStringHack());
 }
 
 // http://b/1158253
 TEST_F(DownloadTest, DISABLED_KnownSize) {
   GURL url(URLRequestSlowDownloadJob::kKnownSizeUrl);
   FilePath filename;
   net::FileURLToFilePath(url, &filename);
   filename = filename.BaseName();
   RunSizeTest(url, L"71% - " + filename.ToWStringHack(),
               L"100% - " + filename.ToWStringHack());
 }
 
 }  // namespace