Adding momentum/overscroll to views:: ScrollViews

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 105 matching lines @@
                bool(const gfx::Point& viewport_point,
                     cc::ScrollDirection direction));
   MOCK_METHOD1(ScrollEnd, void(cc::ScrollState*));
   MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus());
 
   std::unique_ptr<cc::SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor(
       ui::LatencyInfo* latency) override {
     return std::unique_ptr<cc::SwapPromiseMonitor>();
   }
 
-  cc::ScrollElasticityHelper* CreateScrollElasticityHelper() override {
-    return NULL;
+  cc::ScrollElasticityHelper* CreateRootScrollElasticityHelper() override {
+    return nullptr;
+  }
+  base::WeakPtr<cc::ScrollElasticityHelper>
+  ScrollElasticityHelperForScrollingLayer() override {
+    return nullptr;
   }
 
   void BindToClient(cc::InputHandlerClient* client) override {}
 
   void MouseMoveAt(const gfx::Point& mouse_position) override {}
 
   MOCK_CONST_METHOD2(IsCurrentlyScrollingLayerAt,
                      bool(const gfx::Point& point,
                           cc::InputHandler::ScrollInputType type));
 
@@ skipping 2642 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