Consolidate ui::NativeEvent and base::NativeEvent

ui/aura/event.cc

Index: ui/aura/event.cc
diff --git a/ui/aura/event.cc b/ui/aura/event.cc
index aae9d65ed9e980b77afb5b718574bfbd6afed013..cabeae5c87ea33ae68feb51b558d1f6c188ec4fe 100644
--- a/ui/aura/event.cc
+++ b/ui/aura/event.cc
@@ -15,7 +15,9 @@ Event::Event(ui::EventType type, int flags)
   Init();
 }
 
-Event::Event(const ui::NativeEvent& native_event, ui::EventType type, int flags)
+Event::Event(const base::NativeEvent& native_event,
+             ui::EventType type,
+             int flags)
     : type_(type),
       time_stamp_(base::Time::NowFromSystemTime()),
       flags_(flags) {
@@ -33,11 +35,11 @@ void Event::Init() {
   memset(&native_event_, 0, sizeof(native_event_));
 }
 
-void Event::InitWithNativeEvent(const ui::NativeEvent& native_event) {
+void Event::InitWithNativeEvent(const base::NativeEvent& native_event) {
   native_event_ = native_event;
 }
 
-LocatedEvent::LocatedEvent(const ui::NativeEvent& native_event)
+LocatedEvent::LocatedEvent(const base::NativeEvent& native_event)
     : Event(native_event,
             ui::EventTypeFromNative(native_event),
             ui::EventFlagsFromNative(native_event)),
@@ -60,7 +62,7 @@ LocatedEvent::LocatedEvent(ui::EventType type,
       location_(location) {
 }
 
-MouseEvent::MouseEvent(const ui::NativeEvent& native_event)
+MouseEvent::MouseEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event) {
 }
 
@@ -82,7 +84,7 @@ MouseEvent::MouseEvent(ui::EventType type,
     : LocatedEvent(type, location, flags) {
 }
 
-KeyEvent::KeyEvent(const ui::NativeEvent& native_event)
+KeyEvent::KeyEvent(const base::NativeEvent& native_event)
     : Event(native_event,
             ui::EventTypeFromNative(native_event),
             ui::EventFlagsFromNative(native_event)),
@@ -97,4 +99,3 @@ KeyEvent::KeyEvent(ui::EventType type,
 }
 
 }  // namespace aura
-