Remove enable/disable wheel gestures setting.

ui/events/blink/input_handler_proxy_unittest.cc

 // Copyright 2013 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/events/blink/input_handler_proxy.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/test/histogram_tester.h"
@@ skipping 367 matching lines @@
     EXPECT_EQ(expected_disposition_,
               input_handler_->HandleInputEvent(gesture_));
 
     VERIFY_AND_RESET_MOCKS();
   }
 
   void SetSmoothScrollEnabled(bool value) {
     input_handler_->smooth_scroll_enabled_ = value;
   }
 
-  void SetMouseWheelGesturesOn(bool value) {
-    input_handler_->set_use_gesture_events_for_mouse_wheel(value);
-  }
-
   base::HistogramTester& histogram_tester() {
     return histogram_tester_;
   }
 
  protected:
   const bool synchronous_root_scroll_;
   const bool install_synchronous_handler_;
   testing::StrictMock<MockInputHandler> mock_input_handler_;
   testing::StrictMock<MockSynchronousInputHandler>
       mock_synchronous_input_handler_;
   std::unique_ptr<TestInputHandlerProxy> input_handler_;
   testing::StrictMock<MockInputHandlerProxyClient> mock_client_;
   WebGestureEvent gesture_;
   InputHandlerProxy::EventDisposition expected_disposition_;
   base::HistogramTester histogram_tester_;
   cc::InputHandlerScrollResult scroll_result_did_scroll_;
   cc::InputHandlerScrollResult scroll_result_did_not_scroll_;
 };
 
-TEST_P(InputHandlerProxyTest, MouseWheelByPageMainThread) {
-  expected_disposition_ = InputHandlerProxy::DID_NOT_HANDLE;
-  SetMouseWheelGesturesOn(false);
-  WebMouseWheelEvent wheel;
-  wheel.type = WebInputEvent::MouseWheel;
-  wheel.scrollByPage = true;
-
-  EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(wheel));
-  VERIFY_AND_RESET_MOCKS();
-}
-
-TEST_P(InputHandlerProxyTest, MouseWheelWithCtrlNotScroll) {
-  expected_disposition_ = InputHandlerProxy::DID_NOT_HANDLE;
-  SetMouseWheelGesturesOn(false);
-  WebMouseWheelEvent wheel;
-  wheel.type = WebInputEvent::MouseWheel;
-  wheel.modifiers = WebInputEvent::ControlKey;
-  wheel.canScroll = false;
-  EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(wheel));
-  VERIFY_AND_RESET_MOCKS();
-}
-
 TEST_P(InputHandlerProxyTest, MouseWheelNoListener) {
   expected_disposition_ = InputHandlerProxy::DROP_EVENT;
   EXPECT_CALL(mock_input_handler_,
               GetEventListenerProperties(cc::EventListenerClass::kMouseWheel))
       .WillOnce(testing::Return(cc::EventListenerProperties::kNone));
 
   WebMouseWheelEvent wheel;
   wheel.type = WebInputEvent::MouseWheel;
   wheel.modifiers = WebInputEvent::ControlKey;
   EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(wheel));
@@ skipping 19 matching lines @@
               GetEventListenerProperties(cc::EventListenerClass::kMouseWheel))
       .WillOnce(testing::Return(cc::EventListenerProperties::kBlocking));
 
   WebMouseWheelEvent wheel;
   wheel.type = WebInputEvent::MouseWheel;
   wheel.modifiers = WebInputEvent::ControlKey;
   EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(wheel));
   VERIFY_AND_RESET_MOCKS();
 }
 
-// Mac does not smooth scroll wheel events (crbug.com/574283).
-#if !defined(OS_MACOSX)
-TEST_P(InputHandlerProxyTest, MouseWheelWithPreciseScrollingDeltas) {
-#else
-TEST_P(InputHandlerProxyTest, DISABLED_MouseWheelWithPreciseScrollingDeltas) {
-#endif
-  SetSmoothScrollEnabled(true);
-  SetMouseWheelGesturesOn(false);
-  expected_disposition_ = InputHandlerProxy::DID_HANDLE;
-  WebMouseWheelEvent wheel;
-  wheel.type = WebInputEvent::MouseWheel;
-
-  VERIFY_AND_RESET_MOCKS();
-
-  // Smooth scroll because hasPreciseScrollingDeltas is set to false.
-  wheel.hasPreciseScrollingDeltas = false;
-  EXPECT_CALL(mock_input_handler_, ScrollAnimated(::testing::_, ::testing::_))
-      .WillOnce(testing::Return(kImplThreadScrollState));
-  EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(wheel));
-
-  VERIFY_AND_RESET_MOCKS();
-
-  // No smooth scroll because hasPreciseScrollingDeltas is set to true.
-  wheel.hasPreciseScrollingDeltas = true;
-  EXPECT_CALL(mock_input_handler_, ScrollBegin(::testing::_, ::testing::_))
-      .WillOnce(testing::Return(kImplThreadScrollState));
-  EXPECT_CALL(mock_input_handler_, ScrollBy(::testing::_))
-      .WillOnce(testing::Return(scroll_result_did_scroll_));
-  EXPECT_CALL(mock_input_handler_, ScrollEnd(testing::_));
-  EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(wheel));
-
-  VERIFY_AND_RESET_MOCKS();
-}
-
-// Mac does not smooth scroll wheel events (crbug.com/574283).
-#if !defined(OS_MACOSX)
-TEST_P(InputHandlerProxyTest, MouseWheelScrollIgnored) {
-#else
-TEST_P(InputHandlerProxyTest, DISABLED_MouseWheelScrollIgnored) {
-#endif
-  SetSmoothScrollEnabled(true);
-  SetMouseWheelGesturesOn(false);
-  expected_disposition_ = InputHandlerProxy::DROP_EVENT;
-  WebMouseWheelEvent wheel;
-  wheel.type = WebInputEvent::MouseWheel;
-
-  EXPECT_CALL(mock_input_handler_, ScrollAnimated(testing::_, testing::_))
-      .WillOnce(testing::Return(kScrollIgnoredScrollState));
-
-  EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(wheel));
-  VERIFY_AND_RESET_MOCKS();
-}
-
 TEST_P(InputHandlerProxyTest, GestureScrollStarted) {
   // We shouldn't send any events to the widget for this gesture.
   expected_disposition_ = InputHandlerProxy::DID_HANDLE;
   VERIFY_AND_RESET_MOCKS();
 
   EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))
       .WillOnce(testing::Return(kImplThreadScrollState));
 
   gesture_.type = WebInputEvent::GestureScrollBegin;
   EXPECT_EQ(expected_disposition_,input_handler_->HandleInputEvent(gesture_));
@@ skipping 2324 matching lines @@
       testing::ElementsAre(base::Bucket(1, 1), base::Bucket(3, 1),
                            base::Bucket(5, 1), base::Bucket(14, 1)));
 }
 
 
 INSTANTIATE_TEST_CASE_P(AnimateInput,
                         InputHandlerProxyTest,
                         testing::ValuesIn(test_types));
 }  // namespace test
 }  // namespace ui