Convert Aura to use ui::Event.

ash/drag_drop/drag_drop_controller_unittest.cc

 // Copyright (c) 2012 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 "ash/drag_drop/drag_drop_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/location.h"
 #include "base/utf_string_conversions.h"
-#include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/event.h"
 #include "ui/views/events/event.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/view.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/native_widget_delegate.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
@@ skipping 101 matching lines @@
  private:
   int StartDragAndDrop(const ui::OSExchangeData& data,
                        const gfx::Point& location,
                        int operation) OVERRIDE {
     drag_start_received_ = true;
     data.GetString(&drag_string_);
     return DragDropController::StartDragAndDrop(data, location, operation);
   }
 
   void DragUpdate(aura::Window* target,
-                  const aura::LocatedEvent& event) OVERRIDE {
+                  const ui::LocatedEvent& event) OVERRIDE {
     DragDropController::DragUpdate(target, event);
     num_drag_updates_++;
   }
 
-  void Drop(aura::Window* target, const aura::LocatedEvent& event) OVERRIDE {
+  void Drop(aura::Window* target, const ui::LocatedEvent& event) OVERRIDE {
     DragDropController::Drop(target, event);
     drop_received_ = true;
   }
 
   void DragCancel() OVERRIDE {
     DragDropController::DragCancel();
     drag_canceled_ = true;
   }
 
   DISALLOW_COPY_AND_ASSIGN(TestDragDropController);
@@ skipping 444 matching lines @@
     // initiation in DragDropController::StartDragAndDrop(). Hence we set the
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
     generator.MoveMouseBy(0, 1);
 
     // We send a unexpected mouse move event. Note that we cannot use
     // EventGenerator since it implicitly turns these into mouse drag events.
     // The DragDropController should simply ignore these events.
     gfx::Point mouse_move_location = drag_view->bounds().CenterPoint();
-    aura::MouseEvent mouse_move(ui::ET_MOUSE_MOVED,
-                                mouse_move_location, mouse_move_location, 0);
+    ui::MouseEvent mouse_move(ui::ET_MOUSE_MOVED, mouse_move_location,
+                              mouse_move_location, 0);
     Shell::GetPrimaryRootWindow()->AsRootWindowHostDelegate()->OnHostMouseEvent(
         &mouse_move);
   }
 
   generator.ReleaseLeftButton();
 
   EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
   EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold(),
       drag_drop_controller_->num_drag_updates_);
   EXPECT_TRUE(drag_drop_controller_->drop_received_);
@@ skipping 45 matching lines @@
   EXPECT_EQ(1, drag_view->num_drag_enters_);
   EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold(),
       drag_view->num_drag_updates_);
   EXPECT_EQ(0, drag_view->num_drops_);
   EXPECT_EQ(1, drag_view->num_drag_exits_);
   EXPECT_TRUE(drag_view->drag_done_received_);
 }
 
 }  // namespace test
 }  // namespace aura