Automated ui test porting + cleanup:...

chrome/test/automated_ui_tests/automated_ui_test_base.cc

 // Copyright (c) 2009 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 "base/gfx/point.h"
+#include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
-
-#if defined(TOOLKIT_VIEWS)
-#include "views/view.h"
-#endif
+#include "views/event.h"
 
 AutomatedUITestBase::AutomatedUITestBase() {}
 
 AutomatedUITestBase::~AutomatedUITestBase() {}
 
 void AutomatedUITestBase::LogErrorMessage(const std::string& error) {}
 
 void AutomatedUITestBase::LogWarningMessage(const std::string& warning) {
 }
 
@@ skipping 51 matching lines @@
     return false;
   }
   set_active_browser(browser);
   return true;
 }
 
 bool AutomatedUITestBase::DuplicateTab() {
   return RunCommand(IDC_DUPLICATE_TAB);
 }
 
-#if defined(OS_WIN)
 bool AutomatedUITestBase::DragTabOut() {
   BrowserProxy* browser = active_browser();
   if (browser == NULL) {
     LogErrorMessage("browser_window_not_found");
     return false;
   }
 
   scoped_refptr<WindowProxy> window(
       GetAndActivateWindowForBrowser(browser));
   if (window.get() == NULL) {
@@ skipping 36 matching lines @@
 
   gfx::Rect urlbar_bounds;
   if (!window->GetViewBoundsWithTimeout(VIEW_ID_LOCATION_BAR,
                                         &urlbar_bounds, false,
                                         action_max_timeout_ms(),
                                         &is_timeout)) {
     LogWarningMessage("no_location_bar_found");
     return false;
   }
 
-  // Click on the center of the tab, and drag it downwads.
-  POINT start;
-  POINT end;
-  start.x = dragged_tab_bounds.x() + dragged_tab_bounds.width()/2;
-  start.y = dragged_tab_bounds.y() + dragged_tab_bounds.height()/2;
-  end.x = start.x;
-  end.y = start.y + 3*urlbar_bounds.height();
+  // Click on the center of the tab, and drag it downwards.
+  gfx::Point start;
+  gfx::Point end;
+  start.set_x(dragged_tab_bounds.x() + dragged_tab_bounds.width() / 2);
+  start.set_y(dragged_tab_bounds.y() + dragged_tab_bounds.height() / 2);
+  end.set_x(start.x());
+  end.set_y(start.y() + 3 * urlbar_bounds.height());
 
   if (!browser->SimulateDragWithTimeout(start, end,
                                         views::Event::EF_LEFT_BUTTON_DOWN,
                                         action_max_timeout_ms(),
                                         &is_timeout, false)) {
     LogWarningMessage("failed_to_simulate_drag");
     return false;
   }
 
   return true;
@@ skipping 35 matching lines @@
   gfx::Rect dragged_tab_bounds;
   if (!window->GetViewBoundsWithTimeout(VIEW_ID_TAB_0 + tab_index,
                                         &dragged_tab_bounds, false,
                                         action_max_timeout_ms(),
                                         &is_timeout)) {
     LogWarningMessage("no_tab_view_found");
     return false;
   }
 
   // Click on the center of the tab, and drag it to the left or the right.
-  POINT dragged_tab_point(dragged_tab_bounds.CenterPoint().ToPOINT());
-  POINT destination_point(dragged_tab_point);
+  gfx::Point dragged_tab_point = dragged_tab_bounds.CenterPoint();
+  gfx::Point destination_point = dragged_tab_point;
 
   int new_tab_index;
   if (drag_right) {
     if (tab_index >= (tab_count - 1)) {
       LogInfoMessage("cant_drag_to_right");
       return false;
     }
     new_tab_index = tab_index + 1;
-    destination_point.x += 2 * dragged_tab_bounds.width() / 3;
+    destination_point.Offset(2 * dragged_tab_bounds.width() / 3, 0);
   } else {
     if (tab_index <= 0) {
       LogInfoMessage("cant_drag_to_left");
       return false;
     }
     new_tab_index = tab_index - 1;
-    destination_point.x -= 2 * dragged_tab_bounds.width() / 3;
+    destination_point.Offset(-2 * dragged_tab_bounds.width() / 3, 0);
   }
 
   if (!browser->SimulateDragWithTimeout(dragged_tab_point,
                                         destination_point,
                                         views::Event::EF_LEFT_BUTTON_DOWN,
                                         action_max_timeout_ms(),
                                         &is_timeout, false)) {
     LogWarningMessage("failed_to_simulate_drag");
     return false;
   }
 
   if (!browser->WaitForTabToBecomeActive(new_tab_index, action_timeout_ms())) {
     LogWarningMessage("failed_to_reindex_tab");
     return false;
   }
 
   return true;
 }
-#endif
 
 bool AutomatedUITestBase::FindInPage() {
   if (!RunCommandAsync(IDC_FIND))
     return false;
 
   return WaitForFindWindowVisibilityChange(active_browser(), true);
 }
 
 bool AutomatedUITestBase::ForwardButton() {
   return RunCommand(IDC_FORWARD);
@@ skipping 157 matching lines @@
     BrowserProxy* browser) {
   bool did_timeout;
   if (!browser->BringToFrontWithTimeout(action_max_timeout_ms(),
                                         &did_timeout)) {
     LogWarningMessage("failed_to_bring_window_to_front");
     return NULL;
   }
 
   return browser->GetWindow();
 }