Move logic of recording main thread scrolling reasons from cc to blink::ScrollManager

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/bind.h"
 #include "base/macros.h"
@@ skipping 3007 matching lines @@
 
   EXPECT_CALL(mock_input_handler, SetSynchronousInputHandlerRootScrollOffset(
                                       gfx::ScrollOffset(5, 6)));
   proxy.SynchronouslySetRootScrollOffset(gfx::ScrollOffset(5, 6));
 
   testing::Mock::VerifyAndClearExpectations(&mock_input_handler);
   testing::Mock::VerifyAndClearExpectations(&mock_client);
   testing::Mock::VerifyAndClearExpectations(&mock_synchronous_input_handler);
 }
 
-TEST_P(InputHandlerProxyTest, MainThreadScrollingMouseWheelHistograms) {
+// Only test NotScrollingOnMain, the actual main thread scrolling reasons
+// are tested in EventHandlerTest.MainThreadScrollingReasonRecordTest
+TEST_P(InputHandlerProxyTest, MainThreadScrollingReasonHistograms) {
+  // Test wheel scroll
   input_handler_->RecordMainThreadScrollingReasonsForTest(
       blink::WebGestureDeviceTouchpad,
-      cc::MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects |
-          cc::MainThreadScrollingReason::kThreadedScrollingDisabled |
-          cc::MainThreadScrollingReason::kPageOverlay |
-          cc::MainThreadScrollingReason::kHandlingScrollFromMainThread);
+      cc::MainThreadScrollingReason::kNotScrollingOnMain);
 
   EXPECT_THAT(
       histogram_tester().GetAllSamples("Renderer4.MainThreadWheelScrollReason"),
-      testing::ElementsAre(base::Bucket(1, 1), base::Bucket(3, 1),
-                           base::Bucket(5, 1)));
+      testing::ElementsAre(base::Bucket(0, 1)));
 
-  // We only want to record "Handling scroll from main thread" reason if it's
-  // the only reason. If it's not the only reason, the "real" reason for
-  // scrolling on main is something else, and we only want to pay attention to
-  // that reason. So we should only include this reason in the histogram when
-  // its on its own.
+  // Test touch scroll
   input_handler_->RecordMainThreadScrollingReasonsForTest(
-      blink::WebGestureDeviceTouchpad,
-      cc::MainThreadScrollingReason::kHandlingScrollFromMainThread);
+      blink::WebGestureDeviceTouchscreen,
+      cc::MainThreadScrollingReason::kNotScrollingOnMain);
 
-  EXPECT_THAT(
-      histogram_tester().GetAllSamples("Renderer4.MainThreadWheelScrollReason"),
-      testing::ElementsAre(base::Bucket(1, 1), base::Bucket(3, 1),
-                           base::Bucket(5, 1), base::Bucket(14, 1)));
+  EXPECT_THAT(histogram_tester().GetAllSamples(
+                  "Renderer4.MainThreadGestureScrollReason"),
+              testing::ElementsAre(base::Bucket(0, 1)));
 }
 
 TEST_P(InputHandlerProxyTest, GestureScrollingThreadStatusHistogram) {
   VERIFY_AND_RESET_MOCKS();
 
   WebTouchEvent touch_start(WebInputEvent::TouchStart,
                             WebInputEvent::NoModifiers,
                             WebInputEvent::TimeStampForTesting);
   touch_start.touchesLength = 1;
   touch_start.touches[0] =
@@ skipping 553 matching lines @@
   HandleGestureEvent(WebInputEvent::GestureScrollBegin);
   EXPECT_EQ(0ul, event_queue().size());
 }
 
 INSTANTIATE_TEST_CASE_P(AnimateInput,
                         InputHandlerProxyTest,
                         testing::ValuesIn(test_types));
 
 }  // namespace test
 }  // namespace ui