Move download shelf from per-tab to per-window

chrome/browser/renderer_host/resource_dispatcher_host_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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
@@ skipping 50 matching lines @@
 }
 
 TEST_F(ResourceDispatcherTest, SniffNoContentTypeNoData) {
   CheckTitleTest(L"content-sniffer-test3.html",
                  L"Content Sniffer Test 3");
   PlatformThread::Sleep(sleep_timeout_ms() * 2);
   EXPECT_EQ(1, GetTabCount());
 
   // Make sure the download shelf is not showing.
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
-  scoped_refptr<TabProxy> dl_tab(browser->GetTab(0));
-  ASSERT_TRUE(dl_tab.get());
-
   bool visible = false;
-  ASSERT_TRUE(dl_tab->IsShelfVisible(&visible));
+  ASSERT_TRUE(browser->IsShelfVisible(&visible));
   EXPECT_FALSE(visible);
 }
 
 TEST_F(ResourceDispatcherTest, ContentDispositionEmpty) {
   CheckTitleTest(L"content-disposition-empty.html", L"success");
 }
 
 TEST_F(ResourceDispatcherTest, ContentDispositionInline) {
   CheckTitleTest(L"content-disposition-inline.html", L"success");
 }
@@ skipping 62 matching lines @@
 
   // Navigate to a new page, to dispatch unload event and trigger xhr.
   // (the bug would make this step hang the renderer).
   bool timed_out = false;
   tab->NavigateToURLWithTimeout(server->TestServerPageW(L"files/title2.html"),
                                 action_max_timeout_ms(),
                                 &timed_out);
   EXPECT_FALSE(timed_out);
 
   // Check that the new page got loaded, and that no download was triggered.
+  EXPECT_TRUE(tab->GetTabTitle(&tab_title));
+  EXPECT_EQ(L"Title Of Awesomeness", tab_title);
+
   bool shelf_is_visible = false;
-  EXPECT_TRUE(tab->GetTabTitle(&tab_title));
-  EXPECT_TRUE(tab->IsShelfVisible(&shelf_is_visible));
-  EXPECT_EQ(L"Title Of Awesomeness", tab_title);
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  EXPECT_TRUE(browser->IsShelfVisible(&shelf_is_visible));
   EXPECT_FALSE(shelf_is_visible);
 }
 
 // Tests that onunload is run for cross-site requests.  (Bug 1114994)
 TEST_F(ResourceDispatcherTest, CrossSiteOnunloadCookie) {
   const wchar_t kDocRoot[] = L"chrome/test/data";
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
 
@@ skipping 128 matching lines @@
   std::string redirect_url = "javascript:window.location='" +
       test_url.possibly_invalid_spec() + "'";
   tab->NavigateToURLAsync(GURL(redirect_url));
   // Wait for JavaScript redirect to happen.
   PlatformThread::Sleep(sleep_timeout_ms() * 3);
   EXPECT_TRUE(tab->GetTabTitle(&tab_title));
   EXPECT_EQ(L"Title Of Awesomeness", tab_title);
 }
 
 }  // namespace