Changes tab restore service to handle restoring closed windows as a...

chrome/browser/tab_restore_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/command_line.h"
 #include "base/file_util.h"
 #include "base/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 152 matching lines @@
   // Restore the closed tab.
   RestoreTab();
   tab.reset(browser_proxy->GetActiveTab());
 
   // And make sure the URLs match.
   ASSERT_EQ(http_url2, GetActiveTabURL());
   ASSERT_TRUE(tab->GoBack());
   ASSERT_EQ(http_url1, GetActiveTabURL());
 }
 
-
 // Tests that the SiteInstances used for entries in a restored tab's history
 // are given appropriate max page IDs, even if the renderer for the entry
 // already exists.  (Bug 1204135)
 TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) {
   const wchar_t kDocRoot[] = L"chrome/test/data";
   TestServer server(kDocRoot);
   GURL http_url1(server.TestServerPageW(L"files/title1.html"));
   GURL http_url2(server.TestServerPageW(L"files/title2.html"));
 
   scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
@@ skipping 31 matching lines @@
   ASSERT_TRUE(tab->GoBack());
   ASSERT_EQ(http_url1, GetActiveTabURL());
 
   // Navigating to a new URL should clear the forward list, because the max
   // page ID of the renderer should have been updated when we restored the tab.
   tab->NavigateToURL(http_url2);
   ASSERT_FALSE(tab->GoForward());
   ASSERT_EQ(http_url2, GetActiveTabURL());
 }
 
+TEST_F(TabRestoreUITest, RestoreWindow) {
+  // Create a new window.
+  int window_count;
+  ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
+  ASSERT_TRUE(automation()->OpenNewBrowserWindow(SW_HIDE));
+  ASSERT_TRUE(automation()->WaitForWindowCountToBecome(++window_count,
+                                                       kWaitForActionMaxMsec));
+
+  // Create two more tabs, one with url1, the other url2.
+  scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
+  int initial_tab_count;
+  ASSERT_TRUE(browser_proxy->GetTabCount(&initial_tab_count));
+  browser_proxy->AppendTab(url1_);
+  ASSERT_TRUE(browser_proxy->WaitForTabCountToBecome(initial_tab_count + 1,
+                                                     kWaitForActionMaxMsec));
+  scoped_ptr<TabProxy> new_tab(browser_proxy->GetTab(initial_tab_count));
+  new_tab->NavigateToURL(url1_);
+  browser_proxy->AppendTab(url2_);
+  ASSERT_TRUE(browser_proxy->WaitForTabCountToBecome(initial_tab_count + 2,
+                                                     kWaitForActionMaxMsec));
+  new_tab.reset(browser_proxy->GetTab(initial_tab_count + 1));
+  new_tab->NavigateToURL(url2_);
+
+  // Close the window.
+  ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_CLOSEWINDOW));
+  browser_proxy.reset();
+  new_tab.reset();
+  ASSERT_TRUE(automation()->WaitForWindowCountToBecome(window_count - 1,
+                                                       kWaitForActionMaxMsec));
+
+  // Restore the window.
+  browser_proxy.reset(automation()->GetBrowserWindow(0));
+  ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_RESTORE_TAB));
+  ASSERT_TRUE(automation()->WaitForWindowCountToBecome(window_count,
+                                                       kWaitForActionMaxMsec));
+
+  browser_proxy.reset(automation()->GetBrowserWindow(1));
+  ASSERT_TRUE(browser_proxy->WaitForTabCountToBecome(initial_tab_count + 2,
+                                                     kWaitForActionMaxMsec));
+
+  scoped_ptr<TabProxy> restored_tab_proxy(
+        browser_proxy->GetTab(initial_tab_count));
+  ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(kWaitForActionMsec));
+  GURL url;
+  ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
+  ASSERT_TRUE(url == url1_);
+
+  restored_tab_proxy.reset(
+        browser_proxy->GetTab(initial_tab_count + 1));
+  ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(kWaitForActionMsec));
+  ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
+  ASSERT_TRUE(url == url2_);
+}