events: Update scroll and touch handlers to not return EventResult.

ui/aura/root_window_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/root_window.h"
 
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/event_client.h"
@@ skipping 433 matching lines @@
   virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
     events_.push_back(event->type());
     return ui::ER_UNHANDLED;
   }
 
   virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
     events_.push_back(event->type());
     return ui::ER_UNHANDLED;
   }
 
-  virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE {
+  virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE {
     events_.push_back(event->type());
-    return ui::ER_UNHANDLED;
   }
 
-  virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
+  virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
     events_.push_back(event->type());
-    return ui::ER_UNHANDLED;
   }
 
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
     events_.push_back(event->type());
   }
 
  private:
   Events events_;
 
   DISALLOW_COPY_AND_ASSIGN(EventFilterRecorder);
@@ skipping 298 matching lines @@
 TEST_F(RootWindowTest, GestureRecognizerResetsTargetWhenParentHides) {
   scoped_ptr<Window> w1(CreateWindow(1, root_window(), NULL));
   DetachesParentOnTapDelegate delegate;
   scoped_ptr<Window> parent(CreateWindow(22, w1.get(), NULL));
   Window* child = CreateWindow(11, parent.get(), &delegate);
   test::EventGenerator generator(root_window(), child);
   generator.GestureTapAt(gfx::Point(40, 40));
 }
 
 }  // namespace aura