Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

ui/aura/demo/demo_main.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 "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "third_party/skia/include/core/SkXfermode.h"
@@ skipping 41 matching lines @@
     return HTCAPTION;
   }
   virtual bool ShouldDescendIntoChildForEventHandling(
       aura::Window* child,
       const gfx::Point& location) OVERRIDE {
     return true;
   }
   virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
     return true;
   }
-  virtual ui::TouchStatus OnTouchEvent(ui::TouchEventImpl* event) OVERRIDE {
+  virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
     return ui::TOUCH_STATUS_END;
   }
   virtual ui::GestureStatus OnGestureEvent(
       ui::GestureEventImpl* event) OVERRIDE {
     return ui::GESTURE_STATUS_UNKNOWN;
   }
   virtual bool CanFocus() OVERRIDE { return true; }
   virtual void OnCaptureLost() OVERRIDE {}
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
     canvas->DrawColor(color_, SkXfermode::kSrc_Mode);
@@ skipping 87 matching lines @@
   window3.Show();
   window3.SetParent(&window2);
 
   root_window->ShowRootWindow();
   MessageLoopForUI::current()->Run();
 
   ui::CompositorTestSupport::Terminate();
 
   return 0;
 }