Change all ConvertPointTo* methods to use gfx::Point instead of CPoint....

chrome/browser/views/bookmark_bar_view_test.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 "base/string_util.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/page_navigator.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
@@ skipping 225 matching lines @@
  private:
   void Step2() {
     // Menu should be showing.
     ChromeViews::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL && menu->GetSubmenu()->IsShowing());
 
     // Click on 0x0, which should trigger closing menu.
     // NOTE: this code assume there is a left margin, which is currently
     // true. If that changes, this code will need to find another empty space
     // to press the mouse on.
-    CPoint mouse_loc(0, 0);
+    gfx::Point mouse_loc;
     ChromeViews::View::ConvertPointToScreen(bb_view_, &mouse_loc);
     ui_controls::SendMouseMove(0, 0);
     ui_controls::SendMouseEventsNotifyWhenDone(
         ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest2::Step3));
   }
 
   void Step3() {
     // The menu shouldn't be showing.
     ChromeViews::MenuItemView* menu = bb_view_->GetMenu();
@@ skipping 164 matching lines @@
 
     // Move mouse to center of menu and press button.
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
         ui_controls::DOWN,
         CreateEventTask(this, &BookmarkBarViewTest5::Step3));
   }
 
   void Step3() {
     ChromeViews::MenuItemView* target_menu =
         bb_view_->GetMenu()->GetSubmenu()->GetMenuItemAt(1);
-    CPoint loc(1, target_menu->height() - 1);
+    gfx::Point loc(1, target_menu->height() - 1);
     ChromeViews::View::ConvertPointToScreen(target_menu, &loc);
 
     // Start a drag.
-    ui_controls::SendMouseMoveNotifyWhenDone(loc.x + 10, loc.y,
+    ui_controls::SendMouseMoveNotifyWhenDone(loc.x() + 10, loc.y(),
         CreateEventTask(this, &BookmarkBarViewTest5::Step4));
 
     // See comment above this method as to why we do this.
-    ScheduleMouseMoveInBackground(loc.x, loc.y);
+    ScheduleMouseMoveInBackground(loc.x(), loc.y());
   }
 
   void Step4() {
     // Drop the item so that it's now the second item.
    ChromeViews::MenuItemView* target_menu =
         bb_view_->GetMenu()->GetSubmenu()->GetMenuItemAt(1);
-    CPoint loc(1, target_menu->height() - 1);
+   gfx::Point loc(1, target_menu->height() - 1);
     ChromeViews::View::ConvertPointToScreen(target_menu, &loc);
-    ui_controls::SendMouseMove(loc.x, loc.y);
+    ui_controls::SendMouseMove(loc.x(), loc.y());
 
     ui_controls::SendMouseEventsNotifyWhenDone(ui_controls::LEFT,
         ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest5::Step5));
   }
 
   void Step5() {
     GURL url = model_->GetBookmarkBarNode()->GetChild(0)->GetChild(1)->GetURL();
     ASSERT_TRUE(url == url_dragging_);
     Done();
@@ skipping 71 matching lines @@
     // Move mouse to center of menu and press button.
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
         ui_controls::DOWN,
         CreateEventTask(this, &BookmarkBarViewTest7::Step3));
   }
 
   void Step3() {
     // Drag over other button.
     ChromeViews::TextButton* other_button =
         bb_view_->other_bookmarked_button();
-    CPoint loc(other_button->width() / 2, other_button->height() / 2);
+    gfx::Point loc(other_button->width() / 2, other_button->height() / 2);
     ChromeViews::View::ConvertPointToScreen(other_button, &loc);
 
     // Start a drag.
-    ui_controls::SendMouseMoveNotifyWhenDone(loc.x + 10, loc.y,
+    ui_controls::SendMouseMoveNotifyWhenDone(loc.x() + 10, loc.y(),
         NewRunnableMethod(this, &BookmarkBarViewTest7::Step4));
 
     // See comment above this method as to why we do this.
-    ScheduleMouseMoveInBackground(loc.x, loc.y);
+    ScheduleMouseMoveInBackground(loc.x(), loc.y());
   }
 
   void Step4() {
     ChromeViews::MenuItemView* drop_menu = bb_view_->GetDropMenu();
     ASSERT_TRUE(drop_menu != NULL);
     ASSERT_TRUE(drop_menu->GetSubmenu()->IsShowing());
 
     ChromeViews::MenuItemView* target_menu =
         drop_menu->GetSubmenu()->GetMenuItemAt(0);
-    CPoint loc(1, 1);
+    gfx::Point loc(1, 1);
     ChromeViews::View::ConvertPointToScreen(target_menu, &loc);
-    ui_controls::SendMouseMove(loc.x, loc.y);
+    ui_controls::SendMouseMove(loc.x(), loc.y());
     ui_controls::SendMouseEventsNotifyWhenDone(
         ui_controls::LEFT, ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest7::Step5));
   }
 
   void Step5() {
     ASSERT_TRUE(model_->other_node()->GetChild(0)->GetURL() == url_dragging_);
     Done();
   }
 
@@ skipping 32 matching lines @@
     // Move mouse to center of menu and press button.
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT,
         ui_controls::DOWN,
         CreateEventTask(this, &BookmarkBarViewTest8::Step3));
   }
 
   void Step3() {
     // Drag over other button.
     ChromeViews::TextButton* other_button =
         bb_view_->other_bookmarked_button();
-    CPoint loc(other_button->width() / 2, other_button->height() / 2);
+    gfx::Point loc(other_button->width() / 2, other_button->height() / 2);
     ChromeViews::View::ConvertPointToScreen(other_button, &loc);
 
     // Start a drag.
-    ui_controls::SendMouseMoveNotifyWhenDone(loc.x + 10, loc.y,
+    ui_controls::SendMouseMoveNotifyWhenDone(loc.x() + 10, loc.y(),
         NewRunnableMethod(this, &BookmarkBarViewTest8::Step4));
 
     // See comment above this method as to why we do this.
-    ScheduleMouseMoveInBackground(loc.x, loc.y);
+    ScheduleMouseMoveInBackground(loc.x(), loc.y());
   }
 
   void Step4() {
     ChromeViews::MenuItemView* drop_menu = bb_view_->GetDropMenu();
     ASSERT_TRUE(drop_menu != NULL);
     ASSERT_TRUE(drop_menu->GetSubmenu()->IsShowing());
 
     // Now drag back over first menu.
     ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(0);
-    CPoint loc(button->width() / 2, button->height() / 2);
+    gfx::Point loc(button->width() / 2, button->height() / 2);
     ChromeViews::View::ConvertPointToScreen(button, &loc);
-    ui_controls::SendMouseMoveNotifyWhenDone(loc.x, loc.y,
+    ui_controls::SendMouseMoveNotifyWhenDone(loc.x(), loc.y(),
         NewRunnableMethod(this, &BookmarkBarViewTest8::Step5));
   }
 
   void Step5() {
     // Drop on folder F11.
     ChromeViews::MenuItemView* drop_menu = bb_view_->GetDropMenu();
     ASSERT_TRUE(drop_menu != NULL);
     ASSERT_TRUE(drop_menu->GetSubmenu()->IsShowing());
 
     ChromeViews::MenuItemView* target_menu =
@@ skipping 31 matching lines @@
   }
 
  private:
   void Step2() {
     // Menu should be showing.
     ChromeViews::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     first_menu_ = menu->GetSubmenu()->GetMenuItemAt(0);
-    CPoint menu_loc;
+    gfx::Point menu_loc;
     ChromeViews::View::ConvertPointToScreen(first_menu_, &menu_loc);
-    start_y_ = menu_loc.y;
+    start_y_ = menu_loc.y();
 
     // Move the mouse over the scroll button.
     ChromeViews::View* scroll_container = menu->GetSubmenu()->GetParent();
     ASSERT_TRUE(scroll_container != NULL);
     scroll_container = scroll_container->GetParent();
     ASSERT_TRUE(scroll_container != NULL);
     ChromeViews::View* scroll_down_button = scroll_container->GetChildViewAt(1);
     ASSERT_TRUE(scroll_down_button);
-    CPoint loc(scroll_down_button->width() / 2,
-               scroll_down_button->height() / 2);
+    gfx::Point loc(scroll_down_button->width() / 2,
+                   scroll_down_button->height() / 2);
     ChromeViews::View::ConvertPointToScreen(scroll_down_button, &loc);
     ui_controls::SendMouseMoveNotifyWhenDone(
-        loc.x, loc.y, CreateEventTask(this, &BookmarkBarViewTest9::Step3));
+        loc.x(), loc.y(), CreateEventTask(this, &BookmarkBarViewTest9::Step3));
   }
 
   void Step3() {
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
         NewRunnableMethod(this, &BookmarkBarViewTest9::Step4), 200);
   }
 
   void Step4() {
-    CPoint menu_loc;
+    gfx::Point menu_loc;
     ChromeViews::View::ConvertPointToScreen(first_menu_, &menu_loc);
-    ASSERT_NE(start_y_, menu_loc.y);
+    ASSERT_NE(start_y_, menu_loc.y());
 
     // Hide menu.
     bb_view_->GetMenu()->GetMenuController()->Cancel(true);
 
     Done();
   }
 
   int start_y_;
   ChromeViews::MenuItemView* first_menu_;
 };
@@ skipping 97 matching lines @@
 
   void Step8() {
     ASSERT_TRUE(
         model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->GetURL() ==
         navigator_.url_);
     Done();
   }
 };
 
 VIEW_TEST(BookmarkBarViewTest10, KeyEvents)