Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

ui/aura/root_window_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/root_window.h"
 
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/event_client.h"
@@ skipping 73 matching lines @@
   virtual bool PreHandleKeyEvent(Window* target, ui::KeyEvent* event) OVERRIDE {
     num_key_events_++;
     return true;
   }
   virtual bool PreHandleMouseEvent(Window* target,
                                    ui::MouseEvent* event) OVERRIDE {
     num_mouse_events_++;
     return true;
   }
   virtual ui::TouchStatus PreHandleTouchEvent(
-      Window* target, ui::TouchEventImpl* event) OVERRIDE {
+      Window* target, ui::TouchEvent* event) OVERRIDE {
     return ui::TOUCH_STATUS_UNKNOWN;
   }
   virtual ui::GestureStatus PreHandleGestureEvent(
       Window* target, ui::GestureEventImpl* event) OVERRIDE {
     return ui::GESTURE_STATUS_UNKNOWN;
   }
 
  private:
   // How many key events have been received?
   int num_key_events_;
@@ skipping 256 matching lines @@
     events_.push_back(event->type());
     return true;
   }
   virtual bool PreHandleMouseEvent(Window* target,
                                    ui::MouseEvent* event) OVERRIDE {
     events_.push_back(event->type());
     return true;
   }
   virtual ui::TouchStatus PreHandleTouchEvent(
       Window* target,
-      ui::TouchEventImpl* event) OVERRIDE {
+      ui::TouchEvent* event) OVERRIDE {
     events_.push_back(event->type());
     return ui::TOUCH_STATUS_UNKNOWN;
   }
   virtual ui::GestureStatus PreHandleGestureEvent(
       Window* target,
       ui::GestureEventImpl* event) OVERRIDE {
     events_.push_back(event->type());
     return ui::GESTURE_STATUS_UNKNOWN;
   }
 
@@ skipping 156 matching lines @@
   root_window()->ReleaseMouseMoves();
   root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(
       &mouse_dragged_event2);
   EXPECT_EQ("MOUSE_DRAGGED", EventTypesToString(filter->events()));
   filter->events().clear();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(filter->events().empty());
 }
 
 }  // namespace aura