Making CloseWindow and CloseTab automation API...

chrome/test/automation/automation_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 <sstream>
 
 #include "chrome/test/automation/automation_proxy.h"
 
 #include "base/basictypes.h"
 #include "base/file_version_info.h"
@@ skipping 281 matching lines @@
       command_execution_timeout_ms(), NULL);
 
   if (!succeeded) {
     DLOG(ERROR) << "GetWindowCount did not complete in a timely fashion";
     return false;
   }
 
   return succeeded;
 }
 
+bool AutomationProxy::GetNormalBrowserWindowCount(int* num_windows) {
+  if (!num_windows) {
+    NOTREACHED();
+    return false;
+  }
+
+  bool succeeded = SendWithTimeout(
+      new AutomationMsg_NormalBrowserWindowCount(0, num_windows),
+      command_execution_timeout_ms(), NULL);
+
+  if (!succeeded) {
+    DLOG(ERROR) << "GetNormalWindowCount did not complete in a timely fashion";
+    return false;
+  }
+
+  return succeeded;
+}
+
 bool AutomationProxy::WaitForWindowCountToBecome(int count,
                                                  int wait_timeout) {
   const TimeTicks start = TimeTicks::Now();
   const TimeDelta timeout = TimeDelta::FromMilliseconds(wait_timeout);
   while (TimeTicks::Now() - start < timeout) {
     int new_count;
     bool succeeded = GetBrowserWindowCount(&new_count);
     if (!succeeded) {
       // Try again next round, but log it.
       DLOG(ERROR) << "GetBrowserWindowCount returned false";
@@ skipping 119 matching lines @@
   int handle = 0;
 
   if (!SendWithTimeout(new AutomationMsg_ActiveWindow(0, &handle),
                        command_execution_timeout_ms(), NULL)) {
     return NULL;
   }
 
   return new WindowProxy(this, tracker_.get(), handle);
 }
 
-
 BrowserProxy* AutomationProxy::GetBrowserWindow(int window_index) {
   int handle = 0;
 
   if (!SendWithTimeout(new AutomationMsg_BrowserWindow(0, window_index,
                                                        &handle),
                        command_execution_timeout_ms(), NULL)) {
     DLOG(ERROR) << "GetBrowserWindow did not complete in a timely fashion";
     return NULL;
   }
 
   if (handle == 0) {
     return NULL;
   }
 
   return new BrowserProxy(this, tracker_.get(), handle);
 }
 
+BrowserProxy* AutomationProxy::FindNormalBrowserWindow() {
+  int handle = 0;
+
+  if (!SendWithTimeout(new AutomationMsg_FindNormalBrowserWindow(0, &handle),
+                       command_execution_timeout_ms(), NULL)) {
+    return NULL;
+  }
+
+  if (handle == 0) {
+    return NULL;
+  }
+
+  return new BrowserProxy(this, tracker_.get(), handle);
+}
+
 BrowserProxy* AutomationProxy::GetLastActiveBrowserWindow() {
   int handle = 0;
 
   if (!SendWithTimeout(new AutomationMsg_LastActiveBrowserWindow(
       0, &handle), command_execution_timeout_ms(), NULL)) {
     DLOG(ERROR) <<
         "GetLastActiveBrowserWindow did not complete in a timely fashion";
     return NULL;
   }
 
@@ skipping 62 matching lines @@
                                                &handle));
   if (!succeeded) {
     return NULL;
   }
 
   DCHECK(IsWindow(*external_tab_container));
 
   return new TabProxy(this, tracker_.get(), handle);
 }
 #endif  // defined(OS_WIN)