Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/input/scroll_elasticity_helper.h

 // Copyright 2014 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.
 
 #ifndef CC_INPUT_SCROLL_ELASTICITY_HELPER_H_
 #define CC_INPUT_SCROLL_ELASTICITY_HELPER_H_
 
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
 #include "ui/gfx/geometry/scroll_offset.h"
@@ skipping 34 matching lines @@
 // would be possible, in principle, for LayerTreeHostImpl to implement this
 // interface itself. This artificial boundary is introduced to reduce the amount
 // of logic and state held directly inside LayerTreeHostImpl.
 class CC_EXPORT ScrollElasticityHelper {
  public:
   static ScrollElasticityHelper* CreateForLayerTreeHostImpl(
       LayerTreeHostImpl* layer_tree_host_impl);
 
   virtual ~ScrollElasticityHelper() {}
 
-  virtual bool IsUserScrollable() const = 0;
-
   // The amount that the view is stretched past the normal allowable bounds.
   virtual gfx::Vector2dF StretchAmount() const = 0;
   virtual void SetStretchAmount(const gfx::Vector2dF& stretch_amount) = 0;
 
   // Functions for the scrolling of the root scroll layer.
   virtual gfx::ScrollOffset ScrollOffset() const = 0;
   virtual gfx::ScrollOffset MaxScrollOffset() const = 0;
   virtual void ScrollBy(const gfx::Vector2dF& delta) = 0;
 
   // Request that the controller have its Animate method called for the next
   // frame.
   virtual void RequestAnimate() = 0;
 };
 
 }  // namespace cc
 
 #endif  // CC_INPUT_SCROLL_ELASTICITY_HELPER_H_