Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent

ash/wm/user_activity_detector_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 "ash/wm/user_activity_detector.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/user_activity_observer.h"
 #include "base/compiler_specific.h"
@@ skipping 79 matching lines @@
   base::TimeDelta advance_delta =
       base::TimeDelta::FromSeconds(UserActivityDetector::kNotifyIntervalSec);
   AdvanceTime(advance_delta);
   ui::MouseEvent mouse_event(
       ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), ui::EF_NONE);
   EXPECT_FALSE(detector_->PreHandleMouseEvent(window.get(), &mouse_event));
   EXPECT_EQ(1, observer_->num_invocations());
   observer_->reset_stats();
 
   AdvanceTime(advance_delta);
-  ui::TouchEventImpl touch_event(
+  ui::TouchEvent touch_event(
       ui::ET_TOUCH_PRESSED, gfx::Point(), 0, base::TimeDelta());
   EXPECT_FALSE(detector_->PreHandleTouchEvent(window.get(), &touch_event));
   EXPECT_EQ(1, observer_->num_invocations());
   observer_->reset_stats();
 
   AdvanceTime(advance_delta);
   ui::GestureEventImpl gesture_event(
       ui::ET_GESTURE_TAP, 0, 0, ui::EF_NONE, base::Time(),
       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 0, 0), 0U);
   EXPECT_FALSE(detector_->PreHandleGestureEvent(window.get(), &gesture_event));
@@ skipping 37 matching lines @@
   scoped_ptr<aura::Window> window(
       aura::test::CreateTestWindowWithId(12345, NULL));
   ui::MouseEvent mouse_event(
       ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), ui::EF_IS_SYNTHESIZED);
   EXPECT_FALSE(detector_->PreHandleMouseEvent(window.get(), &mouse_event));
   EXPECT_EQ(0, observer_->num_invocations());
 }
 
 }  // namespace test
 }  // namespace ash