Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

ui/aura/test/test_window_delegate.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/test/test_window_delegate.h"
 
 #include "base/stringprintf.h"
 #include "ui/aura/window.h"
 #include "ui/base/event.h"
 #include "ui/base/hit_test.h"
@@ skipping 42 matching lines @@
 bool TestWindowDelegate::ShouldDescendIntoChildForEventHandling(
       Window* child,
       const gfx::Point& location) {
   return true;
 }
 
 bool TestWindowDelegate::OnMouseEvent(ui::MouseEvent* event) {
   return false;
 }
 
-ui::TouchStatus TestWindowDelegate::OnTouchEvent(ui::TouchEventImpl* event) {
+ui::TouchStatus TestWindowDelegate::OnTouchEvent(ui::TouchEvent* event) {
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
 ui::GestureStatus TestWindowDelegate::OnGestureEvent(
     ui::GestureEventImpl* event) {
   return ui::GESTURE_STATUS_UNKNOWN;
 }
 
 bool TestWindowDelegate::CanFocus() {
   return true;
@@ skipping 135 matching lines @@
   std::string result = StringPrintf("%d %d",
                                     key_press_count_,
                                     key_release_count_);
   key_press_count_ = 0;
   key_release_count_ = 0;
   return result;
 }
 
 }  // namespace test
 }  // namespace aura