Automated ui test porting + cleanup:...

chrome/test/automation/browser_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_BROWSER_PROXY_H_
 #define CHROME_TEST_AUTOMATION_BROWSER_PROXY_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <string>
 
 #include "chrome/test/automation/automation_handle_tracker.h"
 
 class GURL;
 class TabProxy;
 class WindowProxy;
 class AutocompleteEditProxy;
 
 namespace gfx {
+  class Point;
   class Rect;
 }
 
 // This class presents the interface to actions that can be performed on
 // a given browser window.  Note that this object can be invalidated at any
 // time if the corresponding browser window in the app is closed.  In that case,
 // any subsequent calls will return false immediately.
 class BrowserProxy : public AutomationResourceProxy {
  public:
   BrowserProxy(AutomationMessageSender* sender,
@@ skipping 81 matching lines @@
   // Returns true if the call was successful.
   //
   // The alternate way to test the accelerators is to use the Windows messaging
   // system to send the actual keyboard events (ui_controls.h) A precondition
   // to using this system is that the target window should have the keyboard
   // focus. This leads to a flaky test behavior in circumstances when the
   // desktop screen is locked or the test is being executed over a remote
   // desktop.
   bool ApplyAccelerator(int id);
 
-#if defined(OS_WIN)
-  // TODO(port): Use portable replacement for POINT.
-
   // Performs a drag operation between the start and end points (both defined
   // in window coordinates).  |flags| specifies which buttons are pressed for
   // the drag, as defined in chrome/views/event.h.
-  virtual bool SimulateDrag(const POINT& start, const POINT& end, int flags,
+  virtual bool SimulateDrag(const gfx::Point& start,
+                            const gfx::Point& end,
+                            int flags,
                             bool press_escape_en_route);
 
   // Like SimulateDrag, but returns false if response is not received before
   // the specified timeout.
-  virtual bool SimulateDragWithTimeout(const POINT& start, const POINT& end,
+  virtual bool SimulateDragWithTimeout(const gfx::Point& start,
+                                       const gfx::Point& end,
                                        int flags, uint32 timeout_ms,
                                        bool* is_timeout,
                                        bool press_escape_en_route);
-#endif  // defined(OS_WIN)
 
   // Block the thread until the tab count is |count|.
   // |wait_timeout| is the timeout, in milliseconds, for waiting.
   // Returns true on success.
   bool WaitForTabCountToBecome(int count, int wait_timeout);
 
   // Block the thread until the specified tab is the active tab.
   // |wait_timeout| is the timeout, in milliseconds, for waiting.
   // Returns false if the tab does not become active.
   bool WaitForTabToBecomeActive(int tab, int wait_timeout);
 
   // Opens the FindInPage box. Note: If you just want to search within a tab
   // you don't need to call this function, just use FindInPage(...) directly.
   bool OpenFindInPage();
 
   // Get the x, y coordinates for the Find window. If animating, |x| and |y|
   // will be -1, -1. Returns false on failure.
   bool GetFindWindowLocation(int* x, int* y);
 
   // Returns whether the Find window is fully visible If animating, |is_visible|
   // will be false. Returns false on failure.
   bool IsFindWindowFullyVisible(bool* is_visible);
 
-#if defined(OS_WIN)
-  // TODO(port): Use portable equivalent of HWND.
-
-  // Gets the outermost HWND that corresponds to the given browser.
-  // Returns true if the call was successful.
-  // Note that ideally this should go and the version of WindowProxy should be
-  // used instead.  We have to keep it for start_up_tests that test against a
-  // reference build.
-  bool GetHWND(HWND* handle) const;
-#endif  // defined(OS_WIN)
-
   // Run the specified command in the browser (see browser_commands.cc for the
   // list of supported commands).  Returns true if the command was successfully
   // dispatched, false otherwise.
   bool RunCommandAsync(int browser_command) const;
 
   // Run the specified command in the browser (see browser_commands.cc for the
   // list of supported commands).  Returns true if the command was successfully
   // dispatched and executed, false otherwise.
   bool RunCommand(int browser_command) const;
 
@@ skipping 14 matching lines @@
 
   // Sets the string value of the specified preference.
   bool SetStringPreference(const std::wstring& name, const std::wstring& value);
 
   // Gets the boolean value of the specified preference.
   bool GetBooleanPreference(const std::wstring& name, bool* value);
 
   // Sets the boolean value of the specified preference.
   bool SetBooleanPreference(const std::wstring& name, bool value);
 
+  // Terminates the browser session.

[huanr, 2009/09/22 03:42:24]

Would be helpful if adding comments saying this happens due to the user shuts
down the machine or logs off. We already have a function UITest::CloseBrowser().

[Evan Stade, 2009/09/22 19:42:01]

Done.

+  bool TerminateSession();
+
  protected:
   virtual ~BrowserProxy() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_BROWSER_PROXY_H_