Adding phase info to wheel events migrated to wheel phase handler class.

content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

 // 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 "content/browser/renderer_host/render_widget_host_view_mac.h"
 
 #include <Cocoa/Cocoa.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <tuple>
@@ skipping 1369 matching lines @@
   ASSERT_EQ(2U, process_host->sink().message_count());
   process_host->sink().ClearMessages();
 
   // Send a wheel event with phaseEnded. When wheel scroll latching is enabled
   // the event will be dropped and the mouse_wheel_end_dispatch_timer_ will
   // start.
   NSEvent* wheelEvent2 =
       MockScrollWheelEventWithPhase(@selector(phaseEnded), 0);
   [view->cocoa_view() scrollWheel:wheelEvent2];
   ASSERT_EQ(0U, process_host->sink().message_count());
-  DCHECK(view->HasPendingWheelEndEvent());
+  DCHECK(view->HasPendingWheelEndEventForTesting());
   process_host->sink().ClearMessages();
 
   host->ShutdownAndDestroyWidget(true);
 }
 
 TEST_F(RenderWidgetHostViewMacWithWheelScrollLatchingEnabledTest,
        WheelWithMomentumPhaseBeganStopsTheWheelEndDispatchTimer) {
   // Initialize the view associated with a MockRenderWidgetHostImpl, rather than
   // the MockRenderProcessHost that is set up by the test harness which mocks
   // out |OnMessageReceived()|.
@@ skipping 25 matching lines @@
   ASSERT_EQ(2U, process_host->sink().message_count());
   process_host->sink().ClearMessages();
 
   // Send a wheel event with phaseEnded. When wheel scroll latching is enabled
   // the event will be dropped and the mouse_wheel_end_dispatch_timer_ will
   // start.
   NSEvent* wheelEvent2 =
       MockScrollWheelEventWithPhase(@selector(phaseEnded), 0);
   [view->cocoa_view() scrollWheel:wheelEvent2];
   ASSERT_EQ(0U, process_host->sink().message_count());
-  DCHECK(view->HasPendingWheelEndEvent());
+  DCHECK(view->HasPendingWheelEndEventForTesting());
   process_host->sink().ClearMessages();
 
   // Send a wheel event with momentum phase started, this should stop the wheel
   // end dispatch timer.
   NSEvent* wheelEvent3 =
       MockScrollWheelEventWithMomentumPhase(@selector(phaseBegan), 3);
   ASSERT_TRUE(wheelEvent3);
   [view->cocoa_view() scrollWheel:wheelEvent3];
   ASSERT_EQ(1U, process_host->sink().message_count());
-  DCHECK(!view->HasPendingWheelEndEvent());
+  DCHECK(!view->HasPendingWheelEndEventForTesting());
   process_host->sink().ClearMessages();
 
   host->ShutdownAndDestroyWidget(true);
 }
 
 TEST_F(RenderWidgetHostViewMacWithWheelScrollLatchingEnabledTest,
        WheelWithPhaseBeganDispatchesThePendingWheelEnd) {
   // Initialize the view associated with a MockRenderWidgetHostImpl, rather than
   // the MockRenderProcessHost that is set up by the test harness which mocks
   // out |OnMessageReceived()|.
@@ skipping 25 matching lines @@
   ASSERT_EQ(2U, process_host->sink().message_count());
   process_host->sink().ClearMessages();
 
   // Send a wheel event with phaseEnded. When wheel scroll latching is enabled
   // the event will be dropped and the mouse_wheel_end_dispatch_timer_ will
   // start.
   NSEvent* wheelEvent2 =
       MockScrollWheelEventWithPhase(@selector(phaseEnded), 0);
   [view->cocoa_view() scrollWheel:wheelEvent2];
   ASSERT_EQ(0U, process_host->sink().message_count());
-  DCHECK(view->HasPendingWheelEndEvent());
+  DCHECK(view->HasPendingWheelEndEventForTesting());
   process_host->sink().ClearMessages();
 
   // Send a wheel event with phase started, this should stop the wheel end
   // dispatch timer and dispatch the pending wheel end event for the previous
   // scroll sequence.
   NSEvent* wheelEvent3 =
       MockScrollWheelEventWithPhase(@selector(phaseBegan), 3);
   ASSERT_TRUE(wheelEvent3);
   [view->cocoa_view() scrollWheel:wheelEvent3];
   ASSERT_EQ(2U, process_host->sink().message_count());
-  DCHECK(!view->HasPendingWheelEndEvent());
+  DCHECK(!view->HasPendingWheelEndEventForTesting());
   process_host->sink().ClearMessages();
 
   host->ShutdownAndDestroyWidget(true);
 }
 
 class RenderWidgetHostViewMacPinchTest : public RenderWidgetHostViewMacTest {
  public:
   RenderWidgetHostViewMacPinchTest() : process_host_(nullptr) {}
 
   bool ZoomDisabledForPinchUpdateMessage() {
@@ skipping 520 matching lines @@
   // -performKeyEquivalent: now returns YES to prevent further propagation, and
   // the event is sent to the renderer.
   EXPECT_TRUE([window performKeyEquivalent:key_down]);
   EXPECT_EQ(2U, process_host->sink().message_count());
   EXPECT_EQ("RawKeyDown Char", GetInputMessageTypes(process_host));
 
   rwhv_mac_->release_pepper_fullscreen_window_for_testing();
 }
 
 }  // namespace content