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

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 99 matching lines @@
   detector_->OnAllOutputsTurnedOff();
   AdvanceTime(advance_delta);
   EXPECT_EQ(ui::ER_UNHANDLED, detector_->OnMouseEvent(&mouse_event));
   EXPECT_EQ(0, observer_->num_invocations());
   observer_->reset_stats();
 
   AdvanceTime(advance_delta);
   ui::TouchEvent touch_event(
       ui::ET_TOUCH_PRESSED, gfx::Point(), 0, base::TimeDelta());
   SetEventTarget(window.get(), &touch_event);
-  EXPECT_EQ(ui::ER_UNHANDLED, detector_->OnTouchEvent(&touch_event));
+  detector_->OnTouchEvent(&touch_event);
+  EXPECT_FALSE(touch_event.handled());
   EXPECT_EQ(1, observer_->num_invocations());
   observer_->reset_stats();
 
   AdvanceTime(advance_delta);
   ui::GestureEvent gesture_event(
       ui::ET_GESTURE_TAP, 0, 0, ui::EF_NONE,
       base::TimeDelta::FromMilliseconds(base::Time::Now().ToDoubleT() * 1000),
       ui::GestureEventDetails(ui::ET_GESTURE_TAP, 0, 0), 0U);
   SetEventTarget(window.get(), &gesture_event);
   detector_->OnGestureEvent(&gesture_event);
@@ skipping 41 matching lines @@
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(12345));
   ui::MouseEvent mouse_event(
       ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), ui::EF_IS_SYNTHESIZED);
   SetEventTarget(window.get(), &mouse_event);
   EXPECT_EQ(ui::ER_UNHANDLED, detector_->OnMouseEvent(&mouse_event));
   EXPECT_EQ(0, observer_->num_invocations());
 }
 
 }  // namespace test
 }  // namespace ash