Clean up viewport scrolling methods in CC

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 e2a2d3dbf525f63ef1234af00717d4fd81c0c7be..81b1d09911abf69a624d484dda6ed4121f5aea52 100644
--- a/ui/events/blink/input_handler_proxy.cc
+++ b/ui/events/blink/input_handler_proxy.cc
@@ -1040,7 +1040,7 @@ void InputHandlerProxy::ExtendBoostedFlingTimeout(
 void InputHandlerProxy::Animate(base::TimeTicks time) {
   // If using synchronous animate, then only expect Animate attempts started by
   // the synchronous system. Don't let the InputHandler try to Animate also.
-  DCHECK(!input_handler_->IsCurrentlyScrollingInnerViewport() ||
+  DCHECK(!input_handler_->IsCurrentlyScrollingViewport() ||
          allow_root_animate_);
 
   if (scroll_elasticity_controller_)
@@ -1245,7 +1245,7 @@ void InputHandlerProxy::RequestAnimation() {
   // it to allow it to control when or if the root fling is animated. Non-root
   // flings always go through the normal InputHandler.
   if (synchronous_input_handler_ &&
-      input_handler_->IsCurrentlyScrollingInnerViewport())
+      input_handler_->IsCurrentlyScrollingViewport())
     synchronous_input_handler_->SetNeedsSynchronousAnimateInput();
   else
     input_handler_->SetNeedsAnimateInput();