Making CloseWindow and CloseTab automation API

synchronous and robust.

Adding automation APIs with corresponding
IPC messages to count and find normal browser
windows.


Review URL: http://codereview.chromium.org/99268

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15058 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 33 insertions, 1 deletions

diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index ef70de8..5489745 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -299,6 +299,24 @@ bool AutomationProxy::GetBrowserWindowCount(int* num_windows) {
   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();
@@ -438,7 +456,6 @@ WindowProxy* AutomationProxy::GetActiveWindow() {
   return new WindowProxy(this, tracker_.get(), handle);
 }
 
-
 BrowserProxy* AutomationProxy::GetBrowserWindow(int window_index) {
   int handle = 0;
 
@@ -456,6 +473,21 @@ BrowserProxy* AutomationProxy::GetBrowserWindow(int window_index) {
   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;