Convert Aura to use ui::Event.

ash/launcher/launcher_view_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/launcher/launcher_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_icon_observer.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_tooltip_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/launcher_view_test_api.h"
 #include "ash/test/test_launcher_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "grit/ui_resources.h"
-#include "ui/aura/event.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
+#include "ui/base/event.h"
 #include "ui/base/events.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 namespace test {
 
 ////////////////////////////////////////////////////////////////////////////////
 // LauncherIconObserver tests.
@@ skipping 225 matching lines @@
     }
   }
 
   views::View* SimulateDrag(internal::LauncherButtonHost::Pointer pointer,
                             int button_index,
                             int destination_index) {
     internal::LauncherButtonHost* button_host = launcher_view_.get();
 
     // Mouse down.
     views::View* button = test_api_->GetButton(button_index);
-    aura::MouseEvent click_event(ui::ET_MOUSE_PRESSED,
-                                 button->bounds().origin(),
-                                 button->bounds().origin(), 0);
+    ui::MouseEvent click_event(ui::ET_MOUSE_PRESSED,
+                               button->bounds().origin(),
+                               button->bounds().origin(), 0);
     views::MouseEvent views_click_event(&click_event);
     button_host->PointerPressedOnButton(button, pointer, views_click_event);
 
     // Drag.
     views::View* destination = test_api_->GetButton(destination_index);
-    aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED,
-                                destination->bounds().origin(),
-                                destination->bounds().origin(), 0);
+    ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED,
+                              destination->bounds().origin(),
+                              destination->bounds().origin(), 0);
     views::MouseEvent views_drag_event(&drag_event);
     button_host->PointerDraggedOnButton(button, pointer, views_drag_event);
     return button;
   }
 
   void SetupForDragTest(
       std::vector<std::pair<LauncherID, views::View*> >* id_map) {
     // Initialize |id_map| with the automatically-created launcher buttons.
     for (size_t i = 0; i < model_->items().size(); ++i) {
       id_map->push_back(std::make_pair(model_->items()[i].id,
@@ skipping 411 matching lines @@
   const int app_list_button_index = test_api_->GetButtonCount() - 1;
   const gfx::Rect& app_list_ideal_bounds =
       test_api_->GetIdealBoundsByIndex(app_list_button_index);
   const gfx::Rect& app_list_bounds =
       test_api_->GetBoundsByIndex(app_list_button_index);
   EXPECT_EQ(app_list_bounds, app_list_ideal_bounds);
 }
 
 }  // namespace test
 }  // namespace ash