Clean up some detritus that accumulated during the fixing of 125937.

ui/base/event.cc

Index: ui/base/event.cc
===================================================================
--- ui/base/event.cc	(revision 151623)
+++ ui/base/event.cc	(working copy)
@@ -39,6 +39,9 @@
 
 namespace ui {
 
+////////////////////////////////////////////////////////////////////////////////
+// Event
+
 Event::~Event() {
 #if defined(USE_X11)
   if (delete_native_event_)
@@ -72,7 +75,6 @@
 
 Event::Event(const Event& copy)
     : native_event_(copy.native_event_),
-      ui_native_event_(copy.ui_native_event_),
       type_(copy.type_),
       time_stamp_(copy.time_stamp_),
       flags_(copy.flags_),
@@ -81,14 +83,15 @@
 
 void Event::Init() {
   std::memset(&native_event_, 0, sizeof(native_event_));
-  std::memset(&ui_native_event_, 0, sizeof(ui_native_event_));
 }
 
 void Event::InitWithNativeEvent(const base::NativeEvent& native_event) {
   native_event_ = native_event;
-  std::memset(&ui_native_event_, 0, sizeof(ui_native_event_));
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// LocatedEvent
+
 LocatedEvent::~LocatedEvent() {
 }
 
@@ -124,6 +127,9 @@
   root_location_ = location_ = p.AsPoint();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// MouseEvent
+
 MouseEvent::MouseEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event),
       changed_button_flags_(
@@ -230,16 +236,19 @@
 MouseEvent::MouseEvent(const MouseEvent& model) : LocatedEvent(model) {
 }
 
-MouseWheelEvent::MouseWheelEvent(const NativeEvent& native_event)
-#if defined(USE_AURA)
-    : MouseEvent(static_cast<const MouseEvent&>(*native_event)),
-      offset_(GetMouseWheelOffset(native_event->native_event())) {
-#else
+////////////////////////////////////////////////////////////////////////////////
+// MouseWheelEvent
+
+MouseWheelEvent::MouseWheelEvent(const base::NativeEvent& native_event)
     : MouseEvent(native_event),
       offset_(GetMouseWheelOffset(native_event)) {
-#endif
 }
 
+MouseWheelEvent::MouseWheelEvent(const MouseEvent& mouse_event)
+    : MouseEvent(mouse_event),
+      offset_(GetMouseWheelOffset(mouse_event.native_event())) {
+}
+
 MouseWheelEvent::MouseWheelEvent(const ScrollEvent& scroll_event)
     : MouseEvent(scroll_event),
       offset_(scroll_event.y_offset()) {
@@ -255,6 +264,9 @@
 const int MouseWheelEvent::kWheelDelta = 53;
 #endif
 
+////////////////////////////////////////////////////////////////////////////////
+// TouchEvent
+
 TouchEvent::TouchEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event),
       touch_id_(GetTouchId(native_event)),
@@ -290,6 +302,9 @@
     radius_y_ /= scale.y();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// TestTouchEvent
+
 TestTouchEvent::TestTouchEvent(EventType type,
                                int x,
                                int y,
@@ -306,6 +321,9 @@
   set_force(force);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// KeyEvent
+
 KeyEvent::KeyEvent(const base::NativeEvent& native_event, bool is_char)
     : Event(native_event,
             EventTypeFromNative(native_event),
@@ -388,6 +406,9 @@
   return copy;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// TranslatedKeyEvent
+
 TranslatedKeyEvent::TranslatedKeyEvent(const base::NativeEvent& native_event,
                                        bool is_char)
     : KeyEvent(native_event, is_char) {
@@ -408,6 +429,9 @@
            ET_KEY_PRESSED : ET_KEY_RELEASED);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// ScrollEvent
+
 ScrollEvent::ScrollEvent(const base::NativeEvent& native_event)
     : MouseEvent(native_event) {
   if (type() == ET_SCROLL) {
@@ -420,6 +444,9 @@
   }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// GestureEvent
+
 GestureEvent::GestureEvent(EventType type,
                            int x,
                            int y,