Automated ui test porting + cleanup:...

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/gfx/point.h"
 #include "base/logging.h"
 #include "base/platform_thread.h"
 #include "base/time.h"
 #include "chrome/test/automation/autocomplete_edit_proxy.h"
 #include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 
@@ skipping 152 matching lines @@
     succeeded = false;
   }
 
   return succeeded;
 }
 
 bool BrowserProxy::ApplyAccelerator(int id) {
   return RunCommandAsync(id);
 }
 
-#if defined(OS_WIN)
-// TODO(port): Replace POINT.
-bool BrowserProxy::SimulateDrag(const POINT& start,
-                                const POINT& end,
+bool BrowserProxy::SimulateDrag(const gfx::Point& start,
+                                const gfx::Point& end,
                                 int flags,
                                 bool press_escape_en_route) {
   return SimulateDragWithTimeout(start, end, flags, base::kNoTimeout, NULL,
                                  press_escape_en_route);
 }
 
-bool BrowserProxy::SimulateDragWithTimeout(const POINT& start,
-                                           const POINT& end,
+bool BrowserProxy::SimulateDragWithTimeout(const gfx::Point& start,
+                                           const gfx::Point& end,
                                            int flags,
                                            uint32 timeout_ms,
                                            bool* is_timeout,
                                            bool press_escape_en_route) {
   if (!is_valid())
     return false;
 
-  std::vector<POINT> drag_path;
+  std::vector<gfx::Point> drag_path;
   drag_path.push_back(start);
   drag_path.push_back(end);
 
   bool result = false;
 
   sender_->SendWithTimeout(new AutomationMsg_WindowDrag(
       0, handle_, drag_path, flags, press_escape_en_route, &result),
       timeout_ms, is_timeout);
 
   return result;
 }
-#endif  // defined(OS_WIN)
 
 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) {
     PlatformThread::Sleep(automation::kSleepTime);
     bool is_timeout;
     int new_count;
     bool succeeded = GetTabCountWithTimeout(&new_count, wait_timeout,
                                             &is_timeout);
@@ skipping 42 matching lines @@
 
   if (!is_visible) {
     NOTREACHED();
     return false;
   }
 
   return sender_->Send(
       new AutomationMsg_FindWindowVisibility(0, handle_, is_visible));
 }
 
-#if defined(OS_WIN)
-// TODO(port): Replace HWND.
-bool BrowserProxy::GetHWND(HWND* handle) const {
-  if (!is_valid())
-    return false;
-
-  if (!handle) {
-    NOTREACHED();
-    return false;
-  }
-
-  return sender_->Send(new AutomationMsg_WindowHWND(0, handle_, handle));
-}
-#endif  // defined(OS_WIN)
-
 bool BrowserProxy::RunCommandAsync(int browser_command) const {
   if (!is_valid())
     return false;
 
   bool result = false;
 
   sender_->Send(new AutomationMsg_WindowExecuteCommandAsync(0, handle_,
                                                             browser_command,
                                                             &result));
 
@@ skipping 88 matching lines @@
   if (!is_valid())
     return false;
 
   bool result = false;
 
   sender_->Send(new AutomationMsg_SetBooleanPreference(0, handle_, name,
                                                        value, &result));
   return result;
 }
 
+bool BrowserProxy::TerminateSession() {
+  if (!is_valid())
+    return false;
+
+  bool result = false;
+
+  sender_->Send(new AutomationMsg_TerminateSession(0, handle_, &result));
+
+  return result;
+}
+
 scoped_refptr<WindowProxy> BrowserProxy::GetWindow() const {
   if (!is_valid())
     return NULL;
 
   bool handle_ok = false;
   int window_handle = 0;
 
   sender_->Send(new AutomationMsg_WindowForBrowser(0, handle_, &handle_ok,
                                                    &window_handle));
   if (!handle_ok)
@@ skipping 31 matching lines @@
   if (!p) {
     p = new AutocompleteEditProxy(sender_, tracker_, autocomplete_edit_handle);
     p->AddRef();
   }
 
   // Since there is no scoped_refptr::attach.
   scoped_refptr<AutocompleteEditProxy> result;
   result.swap(&p);
   return result;
 }