Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / drag_drop / drag_drop_controller_unittest.cc

diff --git a/src/ash/drag_drop/drag_drop_controller_unittest.cc b/src/ash/drag_drop/drag_drop_controller_unittest.cc
index 4051cc6..e08d793 100644 (file)
--- a/src/ash/drag_drop/drag_drop_controller_unittest.cc
+++ b/src/ash/drag_drop/drag_drop_controller_unittest.cc
@@ -24,6 +24,7 @@
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gestures/gesture_types.h"
+#include "ui/events/test/events_test_utils.h"
 #include "ui/gfx/animation/linear_animation.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/views/test/test_views_delegate.h"
@@ -148,11 +149,9 @@ class CompletableLinearAnimation : public gfx::LinearAnimation {
   int duration_;
 };
 
-class TestDragDropController : public internal::DragDropController {
+class TestDragDropController : public DragDropController {
  public:
-  TestDragDropController() : internal::DragDropController() {
-    Reset();
-  }
+  TestDragDropController() : DragDropController() { Reset(); }
 
   void Reset() {
     drag_start_received_ = false;
@@ -284,8 +283,12 @@ void DispatchGesture(ui::EventType gesture_type, gfx::Point location) {
       ui::EventTimeForNow(),
       ui::GestureEventDetails(gesture_type, 0, 0),
       1);
-  Shell::GetPrimaryRootWindow()->GetHost()->dispatcher()->DispatchGestureEvent(
-      &gesture_event);
+  ui::EventSource* event_source =
+      Shell::GetPrimaryRootWindow()->GetHost()->GetEventSource();
+  ui::EventSourceTestApi event_source_test(event_source);
+  ui::EventDispatchDetails details =
+      event_source_test.SendEventToProcessor(&gesture_event);
+  CHECK(!details.dispatcher_destroyed);
 }
 
 }  // namespace
@@ -333,7 +336,7 @@ class DragDropControllerTest : public AshTestBase {
         NULL;
   }
 
-  internal::DragDropTracker* drag_drop_tracker() {
+  DragDropTracker* drag_drop_tracker() {
     return drag_drop_controller_->drag_drop_tracker_.get();
   }