Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

content/browser/renderer_host/web_input_event_aura.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 "content/browser/renderer_host/web_input_event_aura.h"
 
 #include "ui/aura/window.h"
 #include "ui/base/event.h"
 
 namespace content {
@@ skipping 15 matching lines @@
     ui::MouseEvent* event);
 WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
     ui::ScrollEvent* event);
 WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
     ui::KeyEvent* event);
 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
     ui::GestureEventImpl* event);
 WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
     ui::ScrollEvent* event);
 WebKit::WebTouchPoint* UpdateWebTouchEventFromAuraEvent(
-    ui::TouchEventImpl* event, WebKit::WebTouchEvent* web_event);
+    ui::TouchEvent* event, WebKit::WebTouchEvent* web_event);
 #endif
 
 // General approach:
 //
 // ui::Event only carries a subset of possible event data provided to Aura by
 // the host platform. WebKit utilizes a larger subset of that information than
 // Aura itself. WebKit includes some built in cracking functionality that we
 // rely on to obtain this information cleanly and consistently.
 //
 // The only place where an ui::Event's data differs from what the underlying
@@ skipping 130 matching lines @@
 }
 
 WebKit::WebGestureEvent MakeWebGestureEventFlingCancel() {
   WebKit::WebGestureEvent gesture_event;
 
   // All other fields are ignored on a GestureFlingCancel event.
   gesture_event.type = WebKit::WebInputEvent::GestureFlingCancel;
   return gesture_event;
 }
 
-WebKit::WebTouchPoint* UpdateWebTouchEvent(ui::TouchEventImpl* event,
+WebKit::WebTouchPoint* UpdateWebTouchEvent(ui::TouchEvent* event,
                                            WebKit::WebTouchEvent* web_event) {
 #if defined(OS_WIN)
   return UpdateWebTouchEventFromNativeEvent(event->native_event(), web_event);
 #else
   return UpdateWebTouchEventFromAuraEvent(event, web_event);
 #endif
 }
 
 }  // namespace content