Convert Aura to use ui::Event.

ui/views/widget/native_widget_aura_unittest.cc

Index: ui/views/widget/native_widget_aura_unittest.cc
===================================================================
--- ui/views/widget/native_widget_aura_unittest.cc	(revision 150582)
+++ ui/views/widget/native_widget_aura_unittest.cc	(working copy)
@@ -11,11 +11,11 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/env.h"
-#include "ui/aura/event.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/window.h"
+#include "ui/base/event.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/root_view.h"
@@ -252,8 +252,8 @@
   widget->SetContentsView(view);
   widget->Show();
 
-  aura::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(41, 51), 1,
-                         base::TimeDelta());
+  ui::TouchEventImpl press(ui::ET_TOUCH_PRESSED, gfx::Point(41, 51), 1,
+                           base::TimeDelta());
   root_window()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
   // Both views should get the press.
   EXPECT_TRUE(view->got_gesture_event());
@@ -265,8 +265,8 @@
 
   // Release touch. Only |view| should get the release since that it consumed
   // the press.
-  aura::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(250, 251), 1,
-                           base::TimeDelta());
+  ui::TouchEventImpl release(ui::ET_TOUCH_RELEASED, gfx::Point(250, 251), 1,
+                             base::TimeDelta());
   root_window()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);
   EXPECT_TRUE(view->got_gesture_event());
   EXPECT_FALSE(child->got_gesture_event());
@@ -287,8 +287,8 @@
   widget->SetContentsView(view);
   widget->Show();
 
-  aura::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(41, 51), 1,
-                         base::TimeDelta());
+  ui::TouchEventImpl press(ui::ET_TOUCH_PRESSED, gfx::Point(41, 51), 1,
+                           base::TimeDelta());
   root_window()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
   EXPECT_TRUE(view->got_gesture_event());
   view->clear_got_gesture_event();
@@ -297,8 +297,8 @@
   EXPECT_TRUE(widget->HasCapture());
 
   // Generate a release, this should trigger releasing capture.
-  aura::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(41, 51), 1,
-                           base::TimeDelta());
+  ui::TouchEventImpl release(ui::ET_TOUCH_RELEASED, gfx::Point(41, 51), 1,
+                             base::TimeDelta());
   root_window()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);
   EXPECT_TRUE(view->got_gesture_event());
   view->clear_got_gesture_event();