1 files changed, 17 insertions, 17 deletions
diff --git a/webkit/tools/test_shell/drag_delegate.cc b/webkit/tools/test_shell/drag_delegate.cc
index f3532ad..5f447ef 100644
--- a/webkit/tools/test_shell/drag_delegate.cc
+++ b/webkit/tools/test_shell/drag_delegate.cc
@@ -1,11 +1,9 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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 "webkit/tools/test_shell/drag_delegate.h"
 
-#include <atltypes.h>
-
 #include "webkit/api/public/WebPoint.h"
 #include "webkit/glue/webview.h"
 
@@ -13,14 +11,18 @@ using WebKit::WebPoint;
 
 namespace {
 
-void GetCursorPositions(HWND hwnd, CPoint* client, CPoint* screen) {
+void GetCursorPositions(HWND hwnd, gfx::Point* client, gfx::Point* screen) {
   // GetCursorPos will fail if the input desktop isn't the current desktop.
   // See http://b/1173534. (0,0) is wrong, but better than uninitialized.
-  if (!GetCursorPos(screen))
-    screen->SetPoint(0, 0);
-
-  *client = *screen;
-  ScreenToClient(hwnd, client);
+  POINT pos;
+  if (!GetCursorPos(&pos)) {
+    pos.x = 0;
+    pos.y = 0;
+  }
+
+  *screen = gfx::Point(pos);
+  ScreenToClient(hwnd, &pos);
+  *client = gfx::Point(pos);
 }
 
 }  // anonymous namespace
@@ -30,17 +32,15 @@ void TestDragDelegate::OnDragSourceCancel() {
 }
 
 void TestDragDelegate::OnDragSourceDrop() {
-  CPoint client;
-  CPoint screen;
+  gfx::Point client;
+  gfx::Point screen;
   GetCursorPositions(source_hwnd_, &client, &screen);
-  webview_->DragSourceEndedAt(WebPoint(client.x, client.y),
-                              WebPoint(screen.x, screen.y));
+  webview_->DragSourceEndedAt(client, screen);
 }
 
 void TestDragDelegate::OnDragSourceMove() {
-  CPoint client;
-  CPoint screen;
+  gfx::Point client;
+  gfx::Point screen;
   GetCursorPositions(source_hwnd_, &client, &screen);
-  webview_->DragSourceMovedTo(WebPoint(client.x, client.y),
-                              WebPoint(screen.x, screen.y));
+  webview_->DragSourceMovedTo(client, screen);
 }