Move download shelf from per-tab to per-window

chrome/browser/download/save_page_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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/automation/url_request_mock_http_job.h"
@@ skipping 67 matching lines @@
   FilePath dir = save_dir_.AppendASCII("a_files");
 
   GURL url = URLRequestMockHTTPJob::GetMockUrl(
       UTF8ToWide(kTestDir + "/" + file_name));
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab->NavigateToURL(url));
   WaitUntilTabCount(1);
 
   EXPECT_TRUE(tab->SavePage(full_file_name.ToWStringHack(), dir.ToWStringHack(),
                             SavePackage::SAVE_AS_ONLY_HTML));
-  EXPECT_TRUE(WaitForDownloadShelfVisible(tab.get()));
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
 
   CheckFile(full_file_name, FilePath::FromWStringHack(UTF8ToWide(file_name)),
             true);
   EXPECT_FALSE(file_util::PathExists(dir));
 }
 
 TEST_F(SavePageTest, SaveCompleteHTML) {
   std::string file_name = "b.htm";
   FilePath full_file_name = save_dir_.AppendASCII(file_name);
   FilePath dir = save_dir_.AppendASCII("b_files");
 
   GURL url = URLRequestMockHTTPJob::GetMockUrl(UTF8ToWide(kTestDir + "/" +
                                                           file_name));
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab->NavigateToURL(url));
   WaitUntilTabCount(1);
 
   EXPECT_TRUE(tab->SavePage(full_file_name.ToWStringHack(), dir.ToWStringHack(),
                             SavePackage::SAVE_AS_COMPLETE_HTML));
-  EXPECT_TRUE(WaitForDownloadShelfVisible(tab.get()));
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
 
   CheckFile(dir.AppendASCII("1.png"), FilePath(FILE_PATH_LITERAL("1.png")),
                             true);
   CheckFile(dir.AppendASCII("1.css"), FilePath(FILE_PATH_LITERAL("1.css")),
                             true);
   CheckFile(full_file_name, FilePath::FromWStringHack(UTF8ToWide(file_name)),
             false);
   EXPECT_TRUE(DieFileDie(dir, true));
 }
 
 TEST_F(SavePageTest, NoSave) {
   std::string file_name = "c.htm";
   FilePath full_file_name = save_dir_.AppendASCII(file_name);
   FilePath dir = save_dir_.AppendASCII("c_files");
 
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab->NavigateToURL(GURL("about:blank")));
   WaitUntilTabCount(1);
 
   EXPECT_FALSE(tab->SavePage(full_file_name.ToWStringHack(),
                              dir.ToWStringHack(),
                              SavePackage::SAVE_AS_ONLY_HTML));
-  EXPECT_FALSE(WaitForDownloadShelfVisible(tab.get()));
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  EXPECT_FALSE(WaitForDownloadShelfVisible(browser.get()));
 }
 
 TEST_F(SavePageTest, FilenameFromPageTitle) {
   std::string file_name = "b.htm";
 
   FilePath full_file_name = download_dir_.AppendASCII(
       "Test page for saving page feature" + kAppendedExtension);
   FilePath dir = download_dir_.AppendASCII(
       "Test page for saving page feature_files");
 
   GURL url = URLRequestMockHTTPJob::GetMockUrl(UTF8ToWide(kTestDir + "/" +
                                                file_name));
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab->NavigateToURL(url));
   WaitUntilTabCount(1);
 
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   automation()->SavePackageShouldPromptUser(false);
   EXPECT_TRUE(browser->RunCommandAsync(IDC_SAVE_PAGE));
-  EXPECT_TRUE(WaitForDownloadShelfVisible(tab.get()));
+  EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
   automation()->SavePackageShouldPromptUser(true);
 
   CheckFile(dir.AppendASCII("1.png"), FilePath(FILE_PATH_LITERAL("1.png")),
                             true);
   CheckFile(dir.AppendASCII("1.css"), FilePath(FILE_PATH_LITERAL("1.css")),
                             true);
   CheckFile(full_file_name, FilePath::FromWStringHack(UTF8ToWide(file_name)),
             false);
   EXPECT_TRUE(DieFileDie(full_file_name, false));
   EXPECT_TRUE(DieFileDie(dir, true));
@@ skipping 11 matching lines @@
 
   GURL url = URLRequestMockHTTPJob::GetMockUrl(UTF8ToWide(kTestDir + "/" +
                                                file_name));
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab->NavigateToURL(url));
   WaitUntilTabCount(1);
 
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   automation()->SavePackageShouldPromptUser(false);
   EXPECT_TRUE(browser->RunCommandAsync(IDC_SAVE_PAGE));
-  EXPECT_TRUE(WaitForDownloadShelfVisible(tab.get()));
+  EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
   automation()->SavePackageShouldPromptUser(true);
 
   CheckFile(full_file_name, FilePath::FromWStringHack(UTF8ToWide(file_name)),
             false);
   EXPECT_TRUE(DieFileDie(full_file_name, false));
   EXPECT_TRUE(DieFileDie(dir, true));
 }
 #endif