Making CloseWindow and CloseTab automation API...

chrome/test/automation/automation_proxy.h

 // 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.
 
 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 76 matching lines @@
   bool OpenNewBrowserWindow(bool show);
 
   // Fills the number of open browser windows into the given variable, returning
   // true on success. False likely indicates an IPC error.
   bool GetBrowserWindowCount(int* num_windows);
 
   // Block the thread until the window count becomes the provided value.
   // Returns true on success.
   bool WaitForWindowCountToBecome(int target_count, int wait_timeout);
 
+  // Fills the number of open normal browser windows (normal type and
+  // non-incognito mode) into the given variable, returning true on success.
+  // False likely indicates an IPC error.
+  bool GetNormalBrowserWindowCount(int* num_windows);
+
   // Returns whether an app modal dialog window is showing right now (i.e., a
   // javascript alert), and what buttons it contains.
   bool GetShowingAppModalDialog(bool* showing_app_modal_dialog,
                                 MessageBoxFlags::DialogButton* button);
 
   // Simulates a click on a dialog button.
   bool ClickAppModalDialogButton(MessageBoxFlags::DialogButton button);
 
   // Block the thread until a modal dialog is displayed. Returns true on
   // success.
   bool WaitForAppModalDialog(int wait_timeout);
 
   // Block the thread until one of the tabs in any window (including windows
   // opened after the call) displays given url. Returns true on success.
   bool WaitForURLDisplayed(GURL url, int wait_timeout);
 
   // Returns the BrowserProxy for the browser window at the given index,
   // transferring ownership of the pointer to the caller.
   // On failure, returns NULL.
   //
   // Use GetBrowserWindowCount to see how many browser windows you can ask for.
   // Window numbers are 0-based.
   BrowserProxy* GetBrowserWindow(int window_index);
 
+  // Finds the first browser window that is not incognito mode and of type
+  // TYPE_NORMAL, and returns its corresponding BrowserProxy, transferring
+  // ownership of the pointer to the caller.
+  // On failure, returns NULL.
+  BrowserProxy* FindNormalBrowserWindow();
+
   // Returns the BrowserProxy for the browser window which was last active,
   // transferring ownership of the pointer to the caller.
   // TODO: If there was no last active browser window, or the last active
   // browser window no longer exists (for example, if it was closed),
   // returns GetBrowserWindow(0). See crbug.com/10501. As for now this
   // function is flakey.
   BrowserProxy* GetLastActiveBrowserWindow();
 
   // Returns the WindowProxy for the currently active window, transferring
   // ownership of the pointer to the caller.
@@ skipping 102 matching lines @@
   // a version resource.
   bool perform_version_check_;
 
   // Delay to let the browser execute the command.
   base::TimeDelta command_execution_timeout_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__