Roll this change back until I understand the crashes.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5046 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 3 deletions

diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h
index d6a321a8..e6cf72a 100644
--- a/chrome/test/automation/automation_messages_internal.h
+++ b/chrome/test/automation/automation_messages_internal.h
@@ -293,8 +293,8 @@ IPC_BEGIN_MESSAGES(Automation, 0)
   //       defined in chrome/views/event.h
   // Response:
   //   bool - true if the drag could be performed
-  IPC_MESSAGE_ROUTED5(AutomationMsg_WindowDragRequest,
-                      int, POINT, POINT, int, bool)
+  IPC_MESSAGE_ROUTED4(AutomationMsg_WindowDragRequest,
+                      int, std::vector<POINT>, int, bool)
   IPC_MESSAGE_ROUTED1(AutomationMsg_WindowDragResponse, bool)
 
   // Similar to AutomationMsg_InitialLoadsComplete, this indicates that the
diff --git a/chrome/test/automation/browser_proxy.cc b/chrome/test/automation/browser_proxy.cc
index 58543e1..ce47335 100644
--- a/chrome/test/automation/browser_proxy.cc
+++ b/chrome/test/automation/browser_proxy.cc
@@ -247,9 +247,13 @@ bool BrowserProxy::SimulateDragWithTimeout(const POINT& start,
   if (!is_valid())
     return false;
 
+  std::vector<POINT> drag_path;
+  drag_path.push_back(start);
+  drag_path.push_back(end);
+
   IPC::Message* response = NULL;
   bool succeeded = sender_->SendAndWaitForResponseWithTimeout(
-      new AutomationMsg_WindowDragRequest(0, handle_, start, end, flags,
+      new AutomationMsg_WindowDragRequest(0, handle_, drag_path, flags,
                                           press_escape_en_route),
       &response, AutomationMsg_WindowDragResponse::ID, timeout_ms, is_timeout);