events: Clean up dispatching code for touch-events.

ui/base/events/event_dispatcher_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/base/events/event_dispatcher.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
 
@@ skipping 60 matching lines @@
   virtual EventResult OnMouseEvent(MouseEvent* event) OVERRIDE {
     ReceivedEvent(event);
     return event_result_;
   }
 
   virtual EventResult OnScrollEvent(ScrollEvent* event) OVERRIDE {
     ReceivedEvent(event);
     return event_result_;
   }
 
-  virtual TouchStatus OnTouchEvent(TouchEvent* event) OVERRIDE {
+  virtual EventResult OnTouchEvent(TouchEvent* event) OVERRIDE {
     ReceivedEvent(event);
-    return ui::TOUCH_STATUS_UNKNOWN;
+    return event_result_;
   }
 
   virtual EventResult OnGestureEvent(GestureEvent* event) OVERRIDE {
     ReceivedEvent(event);
     return event_result_;
   }
 
   int id_;
   EventResult event_result_;
   EventPhase expected_phase_;
@@ skipping 100 matching lines @@
   EXPECT_EQ(EP_POSTDISPATCH, mouse.phase());
   EXPECT_EQ(result, mouse.result());
   EXPECT_TRUE(result & ER_CONSUMED);
   EXPECT_FALSE(result & ER_HANDLED);
   EXPECT_EQ(
       std::vector<int>(exp, exp + sizeof(exp) / sizeof(int)),
       child.handler_list());
 }
 
 }  // namespace ui