Convert Aura to use ui::Event.

content/browser/renderer_host/web_input_event_aurax11.cc

Index: content/browser/renderer_host/web_input_event_aurax11.cc
===================================================================
--- content/browser/renderer_host/web_input_event_aurax11.cc	(revision 150582)
+++ content/browser/renderer_host/web_input_event_aurax11.cc	(working copy)
@@ -44,7 +44,7 @@
 
 #include "base/event_types.h"
 #include "base/logging.h"
-#include "ui/aura/event.h"
+#include "ui/base/event.h"
 #include "ui/base/events.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
@@ -62,7 +62,7 @@
 // Normalizes event.flags() to make it Windows/Mac compatible. Since the way
 // of setting modifier mask on X is very different than Windows/Mac as shown
 // in http://crbug.com/127142#c8, the normalization is necessary.
-int NormalizeEventFlags(const aura::KeyEvent& event) {
+int NormalizeEventFlags(const ui::KeyEvent& event) {
   int mask = 0;
   switch (event.key_code()) {
     case ui::VKEY_CONTROL:
@@ -182,7 +182,7 @@
 }
 
 WebKit::WebTouchPoint::State TouchPointStateFromEvent(
-    const aura::TouchEvent* event) {
+    const ui::TouchEventImpl* event) {
   switch (event->type()) {
     case ui::ET_TOUCH_PRESSED:
       return WebKit::WebTouchPoint::StatePressed;
@@ -198,7 +198,7 @@
 }
 
 WebKit::WebInputEvent::Type TouchEventTypeFromEvent(
-    const aura::TouchEvent* event) {
+    const ui::TouchEventImpl* event) {
   switch (event->type()) {
     case ui::ET_TOUCH_PRESSED:
       return WebKit::WebInputEvent::TouchStart;
@@ -215,7 +215,7 @@
 
 }  // namespace
 
-WebKit::WebMouseEvent MakeWebMouseEventFromAuraEvent(aura::MouseEvent* event) {
+WebKit::WebMouseEvent MakeWebMouseEventFromAuraEvent(ui::MouseEvent* event) {
   WebKit::WebMouseEvent webkit_event;
 
   webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags());
@@ -252,7 +252,7 @@
 }
 
 WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
-    aura::MouseEvent* event) {
+    ui::MouseEvent* event) {
   WebKit::WebMouseWheelEvent webkit_event;
 
   webkit_event.type = WebKit::WebInputEvent::MouseWheel;
@@ -266,7 +266,7 @@
 }
 
 WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
-    aura::ScrollEvent* event) {
+    ui::ScrollEvent* event) {
   WebKit::WebMouseWheelEvent webkit_event;
 
   webkit_event.type = WebKit::WebInputEvent::MouseWheel;
@@ -283,7 +283,7 @@
 }
 
 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
-    aura::ScrollEvent* event) {
+    ui::ScrollEvent* event) {
   WebKit::WebGestureEvent webkit_event;
 
   switch (event->type()) {
@@ -309,7 +309,7 @@
 }
 
 WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
-    aura::KeyEvent* event) {
+    ui::KeyEvent* event) {
   base::NativeEvent native_event = event->native_event();
   WebKit::WebKeyboardEvent webkit_event;
   XKeyEvent* native_key_event = &native_event->xkey;
@@ -358,7 +358,7 @@
 }
 
 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
-    aura::GestureEvent* event) {
+    ui::GestureEventImpl* event) {
   WebKit::WebGestureEvent gesture_event;
 
   switch (event->type()) {
@@ -422,7 +422,7 @@
 }
 
 WebKit::WebTouchPoint* UpdateWebTouchEventFromAuraEvent(
-    aura::TouchEvent* event, WebKit::WebTouchEvent* web_event) {
+    ui::TouchEventImpl* event, WebKit::WebTouchEvent* web_event) {
   WebKit::WebTouchPoint* point = NULL;
   switch (event->type()) {
     case ui::ET_TOUCH_PRESSED: