Avoided rentry to EventSender::FinishDragAndDrop.

components/test_runner/event_sender.cc

 // Copyright 2014 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 "components/test_runner/event_sender.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 2652 matching lines @@
   WebPoint screen_point(event->globalX, event->globalY);
   current_drag_effect_ = drag_effect;
   if (current_drag_effect_) {
     // Specifically pass any keyboard modifiers to the drop method. This allows
     // tests to control the drop type (i.e. copy or move).
     view()->dragTargetDrop(current_drag_data_, client_point, screen_point,
                            event->modifiers);
   } else {
     view()->dragTargetDragLeave();
   }
+  current_drag_data_.reset();
   view()->dragSourceEndedAt(client_point, screen_point, current_drag_effect_);
   view()->dragSourceSystemDragEnded();
-
-  current_drag_data_.reset();
 }
 
 void EventSender::DoDragAfterMouseUp(const WebMouseEvent& unscaled_event) {
   std::unique_ptr<WebInputEvent> scaled_event = ScaleEvent(unscaled_event);
   const WebMouseEvent* event =
       scaled_event.get() ? static_cast<WebMouseEvent*>(scaled_event.get())
                          : &unscaled_event;
 
   last_click_time_sec_ = event->timeStampSeconds;
   last_click_pos_ = current_pointer_state_[kRawMousePointerId].last_pos_;
@@ skipping 170 matching lines @@
 }
 
 std::unique_ptr<WebInputEvent> EventSender::ScaleEvent(
     const WebInputEvent& event) {
   // ui::ScaleWebInputEvent returns nullptr when the scale is 1.0f as the event
   // does not have to be converted.
   return ui::ScaleWebInputEvent(event, delegate()->GetWindowToViewportScale());
 }
 
 }  // namespace test_runner