cc: Fix enum style conformance in InputHandler.

ui/events/blink/input_handler_proxy.cc

Index: ui/events/blink/input_handler_proxy.cc
diff --git a/ui/events/blink/input_handler_proxy.cc b/ui/events/blink/input_handler_proxy.cc
index 8511af6c0a77f90deab4248cc146e6231cf9606c..2ab671275438808d2607830fedeb99dd5e4958a1 100644
--- a/ui/events/blink/input_handler_proxy.cc
+++ b/ui/events/blink/input_handler_proxy.cc
@@ -16,6 +16,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
+#include "cc/input/main_thread_scrolling_reason.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/blink/input_handler_proxy_client.h"
 #include "ui/events/blink/input_scroll_elasticity_controller.h"
@@ -359,9 +360,8 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent(
   return DID_NOT_HANDLE;
 }
 
-void RecordMainThreadScrollingReasons(
-    WebInputEvent::Type type,
-    cc::InputHandler::MainThreadScrollingReason reasons) {
+void RecordMainThreadScrollingReasons(WebInputEvent::Type type,
+                                      uint32_t reasons) {
   static const char* kGestureHistogramName =
       "Renderer4.MainThreadGestureScrollReason";
   static const char* kWheelHistogramName =
@@ -375,30 +375,33 @@ void RecordMainThreadScrollingReasons(
     return;
   }
 
-  if (reasons == cc::InputHandler::NOT_SCROLLING_ON_MAIN) {
+  if (reasons == cc::MainThreadScrollingReason::kNotScrollingOnMain) {
     if (type == WebInputEvent::GestureScrollBegin) {
       UMA_HISTOGRAM_ENUMERATION(
-          kGestureHistogramName, cc::InputHandler::NOT_SCROLLING_ON_MAIN,
-          cc::InputHandler::MainThreadScrollingReasonCount);
+          kGestureHistogramName,
+          cc::MainThreadScrollingReason::kNotScrollingOnMain,
+          cc::MainThreadScrollingReason::kMainThreadScrollingReasonCount);
     } else {
       UMA_HISTOGRAM_ENUMERATION(
-          kWheelHistogramName, cc::InputHandler::NOT_SCROLLING_ON_MAIN,
-          cc::InputHandler::MainThreadScrollingReasonCount);
+          kWheelHistogramName,
+          cc::MainThreadScrollingReason::kNotScrollingOnMain,
+          cc::MainThreadScrollingReason::kMainThreadScrollingReasonCount);
     }
   }
 
-  for (int i = 0; i < cc::InputHandler::MainThreadScrollingReasonCount - 1;
+  for (uint32_t i = 0;
+       i < cc::MainThreadScrollingReason::kMainThreadScrollingReasonCount - 1;
        ++i) {
     unsigned val = 1 << i;
     if (reasons & val) {
       if (type == WebInputEvent::GestureScrollBegin) {
         UMA_HISTOGRAM_ENUMERATION(
             kGestureHistogramName, i + 1,
-            cc::InputHandler::MainThreadScrollingReasonCount);
+            cc::MainThreadScrollingReason::kMainThreadScrollingReasonCount);
       } else {
         UMA_HISTOGRAM_ENUMERATION(
             kWheelHistogramName, i + 1,
-            cc::InputHandler::MainThreadScrollingReasonCount);
+            cc::MainThreadScrollingReason::kMainThreadScrollingReasonCount);
       }
     }
   }
@@ -497,9 +500,6 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleMouseWheel(
       case cc::InputHandler::SCROLL_ON_MAIN_THREAD:
         result = DID_NOT_HANDLE;
         break;
-      case cc::InputHandler::ScrollStatusCount:
-        NOTREACHED();
-        break;
     }
   }
 
@@ -540,7 +540,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleGestureScrollBegin(
   }
   UMA_HISTOGRAM_ENUMERATION("Renderer4.CompositorScrollHitTestResult",
                             scroll_status.thread,
-                            cc::InputHandler::ScrollStatusCount);
+                            cc::InputHandler::LAST_SCROLL_STATUS + 1);
 
   RecordMainThreadScrollingReasons(gesture_event.type,
                                    scroll_status.main_thread_scrolling_reasons);
@@ -557,9 +557,6 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleGestureScrollBegin(
       return DID_NOT_HANDLE;
     case cc::InputHandler::SCROLL_IGNORED:
       return DROP_EVENT;
-    case cc::InputHandler::ScrollStatusCount:
-      NOTREACHED();
-      break;
   }
   return DID_NOT_HANDLE;
 }
@@ -600,7 +597,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleGestureFlingStart(
   cc::ScrollState scroll_state = CreateScrollStateForGesture(gesture_event);
   cc::InputHandler::ScrollStatus scroll_status;
   scroll_status.main_thread_scrolling_reasons =
-      cc::InputHandler::NOT_SCROLLING_ON_MAIN;
+      cc::MainThreadScrollingReason::kNotScrollingOnMain;
   switch (gesture_event.sourceDevice) {
   case blink::WebGestureDeviceTouchpad:
     if (gesture_event.data.flingStart.targetViewport) {
@@ -615,7 +612,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleGestureFlingStart(
     if (!gesture_scroll_on_impl_thread_) {
       scroll_status.thread = cc::InputHandler::SCROLL_ON_MAIN_THREAD;
       scroll_status.main_thread_scrolling_reasons =
-          cc::InputHandler::CONTINUING_MAIN_THREAD_SCROLL;
+          cc::MainThreadScrollingReason::kContinuingMainThreadScroll;
     } else {
       scroll_status = input_handler_->FlingScrollBegin();
     }
@@ -686,9 +683,6 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleGestureFlingStart(
       }
       return DROP_EVENT;
     }
-    case cc::InputHandler::ScrollStatusCount:
-      NOTREACHED();
-      break;
   }
   return DID_NOT_HANDLE;
 }