Consolidate ui::NativeEvent and base::NativeEvent

ui/aura/event.h

Index: ui/aura/event.h
diff --git a/ui/aura/event.h b/ui/aura/event.h
index f619c12f258a94d5ecb339604ceb47868befbd75..a084f873ea175279a895b9a8c4098d649215cacd 100644
--- a/ui/aura/event.h
+++ b/ui/aura/event.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
+#include "base/event_types.h"
 #include "base/time.h"
 #include "ui/aura/aura_export.h"
 #include "ui/base/events.h"
@@ -19,14 +20,14 @@ class Window;
 
 class AURA_EXPORT Event {
  public:
-  const ui::NativeEvent& native_event() const { return native_event_; }
+  const base::NativeEvent& native_event() const { return native_event_; }
   ui::EventType type() const { return type_; }
   const base::Time& time_stamp() const { return time_stamp_; }
   int flags() const { return flags_; }
 
  protected:
   Event(ui::EventType type, int flags);
-  Event(const ui::NativeEvent& native_event, ui::EventType type, int flags);
+  Event(const base::NativeEvent& native_event, ui::EventType type, int flags);
   Event(const Event& copy);
   void set_type(ui::EventType type) { type_ = type; }
 
@@ -35,9 +36,9 @@ class AURA_EXPORT Event {
 
   // Safely initializes the native event members of this class.
   void Init();
-  void InitWithNativeEvent(const ui::NativeEvent& native_event);
+  void InitWithNativeEvent(const base::NativeEvent& native_event);
 
-  ui::NativeEvent native_event_;
+  base::NativeEvent native_event_;
   ui::EventType type_;
   base::Time time_stamp_;
   int flags_;
@@ -50,7 +51,7 @@ class AURA_EXPORT LocatedEvent : public Event {
   gfx::Point location() const { return location_; }
 
  protected:
-  explicit LocatedEvent(const ui::NativeEvent& native_event);
+  explicit LocatedEvent(const base::NativeEvent& native_event);
 
   // Create a new LocatedEvent which is identical to the provided model.
   // If source / target windows are provided, the model location will be
@@ -68,7 +69,7 @@ class AURA_EXPORT LocatedEvent : public Event {
 
 class AURA_EXPORT MouseEvent : public LocatedEvent {
  public:
-  explicit MouseEvent(const ui::NativeEvent& native_event);
+  explicit MouseEvent(const base::NativeEvent& native_event);
 
   // Create a new MouseEvent which is identical to the provided model.
   // If source / target windows are provided, the model location will be
@@ -88,7 +89,7 @@ class AURA_EXPORT MouseEvent : public LocatedEvent {
 
 class AURA_EXPORT KeyEvent : public Event {
  public:
-  explicit KeyEvent(const ui::NativeEvent& native_event);
+  explicit KeyEvent(const base::NativeEvent& native_event);
 
   // Used for synthetic events in testing.
   KeyEvent(ui::EventType type,