Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

ui/aura/event_filter_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/event_filter.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
@@ skipping 35 matching lines @@
 
   // Overridden from TestWindowDelegate:
   virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
     ++key_event_count_;
     return true;
   }
   virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
     ++mouse_event_count_;
     return true;
   }
-  virtual ui::TouchStatus OnTouchEvent(ui::TouchEventImpl* event) OVERRIDE {
+  virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
     ++touch_event_count_;
     return ui::TOUCH_STATUS_UNKNOWN;
   }
   virtual ui::GestureStatus OnGestureEvent(
       ui::GestureEventImpl* event) OVERRIDE {
     return ui::GESTURE_STATUS_UNKNOWN;
   }
 
  private:
   int key_event_count_;
@@ skipping 79 matching lines @@
   EXPECT_EQ(0, w111_filter->mouse_event_count());
   EXPECT_EQ(0, d1111->mouse_event_count());
   EXPECT_EQ(0, root_window_filter->touch_event_count());
   EXPECT_EQ(0, w1_filter->touch_event_count());
   EXPECT_EQ(0, w111_filter->touch_event_count());
   EXPECT_EQ(0, d1111->touch_event_count());
 }
 
 }  // namespace test
 }  // namespace aura