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

chrome/test/automation/browser_proxy.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/automation/browser_proxy.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/time.h"
@@ skipping 268 matching lines @@
                                             &is_timeout);
     if (!succeeded)
       return false;
     if (count != *new_count)
       return true;
   }
   // If we get here, the tab count hasn't changed.
   return false;
 }
 
+bool BrowserProxy::WaitForTabCountToBecome(int count, int wait_timeout) {
+  const TimeTicks start = TimeTicks::Now();
+  const TimeDelta timeout = TimeDelta::FromMilliseconds(wait_timeout);
+  while (TimeTicks::Now() - start < timeout) {
+    Sleep(automation::kSleepTime);
+    bool is_timeout;
+    int new_count;
+    bool succeeded = GetTabCountWithTimeout(&new_count, wait_timeout,
+                                            &is_timeout);
+    if (!succeeded)
+      return false;
+    if (count == new_count)
+      return true;
+  }
+  // If we get here, the tab count doesn't match.
+  return false;
+}
+
 bool BrowserProxy::WaitForTabToBecomeActive(int tab,
                                             int wait_timeout) {
   const TimeTicks start = TimeTicks::Now();
   const TimeDelta timeout = TimeDelta::FromMilliseconds(wait_timeout);
   while (TimeTicks::Now() - start < timeout) {
     Sleep(automation::kSleepTime);
     int active_tab;
     if (GetActiveTabIndex(&active_tab) && active_tab == tab)
       return true;
   }
@@ skipping 89 matching lines @@
   scoped_ptr<IPC::Message> response_deleter(response);  // Delete on return.
   if (!success)
     return false;
 
   if (AutomationMsg_SetIntPreferenceResponse::Read(response, &success))
     return success;
 
   // We failed to deserialize the returned value.
   return false;
 }