Move download shelf from per-tab to per-window

chrome/browser/download/save_page_uitest.cc

Index: chrome/browser/download/save_page_uitest.cc
===================================================================
--- chrome/browser/download/save_page_uitest.cc	(revision 17483)
+++ chrome/browser/download/save_page_uitest.cc	(working copy)
@@ -85,7 +85,8 @@
 
   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);
@@ -105,7 +106,8 @@
 
   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);
@@ -128,7 +130,8 @@
   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) {
@@ -148,7 +151,7 @@
   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")),
@@ -180,7 +183,7 @@
   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)),