Restore closed tabs into new windows when necessary, and track the windows th...

chrome/test/ui/ui_test.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 "chrome/test/ui/ui_test.h"
 
 #include <set>
 #include <vector>
 
 #include "base/base_switches.h"
@@ skipping 440 matching lines @@
   // the UI tests in single-process mode.
   // TODO(jhughes): figure out why this is necessary at all, and fix it
   if (!in_process_renderer_)
     AssertAppNotRunning(L"Unable to quit all browser processes.");
 #else
   // TODO(port): depends on chrome_process_util.
   NOTIMPLEMENTED();
 #endif
 }
 
-TabProxy* UITest::GetActiveTab() {
-  scoped_ptr<BrowserProxy> window_proxy(automation()->GetBrowserWindow(0));
+TabProxy* UITest::GetActiveTab(int window_index) {
+  EXPECT_GE(window_index, 0);
+  int window_count;
+  // Use EXPECT rather than ASSERT here because ASSERT_* returns void.
+  EXPECT_TRUE(automation()->GetBrowserWindowCount(&window_count));
+  EXPECT_GT(window_count, window_index);
+  scoped_ptr<BrowserProxy> window_proxy(automation()->
+      GetBrowserWindow(window_index));
   if (!window_proxy.get())
     return NULL;
 
   int active_tab_index = -1;
   EXPECT_TRUE(window_proxy->GetActiveTabIndex(&active_tab_index));
   if (active_tab_index == -1)
     return NULL;
 
   return window_proxy->GetTab(active_tab_index);
 }
@@ skipping 65 matching lines @@
     if (visible == wait_for_open && !animating)
       return true;  // Bookmark bar visibility change complete.
 
     // Give it a chance to catch up.
     Sleep(sleep_timeout_ms() / kCycles);
   }
   return false;
 }
 #endif  // defined(OS_WIN)
 
-GURL UITest::GetActiveTabURL() {
-  scoped_ptr<TabProxy> tab_proxy(GetActiveTab());
+GURL UITest::GetActiveTabURL(int window_index) {
+  scoped_ptr<TabProxy> tab_proxy(GetActiveTab(window_index));
   if (!tab_proxy.get())
     return GURL();
 
   GURL url;
   if (!tab_proxy->GetCurrentURL(&url))
     return GURL();
   return url;
 }
 
-std::wstring UITest::GetActiveTabTitle() {
+std::wstring UITest::GetActiveTabTitle(int window_index) {
   std::wstring title;
-  scoped_ptr<TabProxy> tab_proxy(GetActiveTab());
+  scoped_ptr<TabProxy> tab_proxy(GetActiveTab(window_index));
   if (!tab_proxy.get())
     return title;
 
   EXPECT_TRUE(tab_proxy->GetTabTitle(&title));
   return title;
 }
 
-int UITest::GetActiveTabIndex() {
-  scoped_ptr<TabProxy> tab_proxy(GetActiveTab());
+int UITest::GetActiveTabIndex(int window_index) {
+  scoped_ptr<TabProxy> tab_proxy(GetActiveTab(window_index));
   if (!tab_proxy.get())
     return -1;
 
   int index;
   EXPECT_TRUE(tab_proxy->GetTabIndex(&index));
   return index;
 }
 
 bool UITest::IsBrowserRunning() {
   return CrashAwareSleep(0);
@@ skipping 275 matching lines @@
 }
 
 bool UITest::EvictFileFromSystemCacheWrapper(const FilePath& path) {
   for (int i = 0; i < 10; i++) {
     if (file_util::EvictFileFromSystemCache(path))
       return true;
     PlatformThread::Sleep(1000);
   }
   return false;
 }