Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(665)

Unified Diff: ui/events/blink/input_scroll_elasticity_controller_unittest.cc

Issue 2189583004: [not for review - epic CL] Adding Elastic+Momentum+Layered scrolling to views::ScrollView Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Combined rebase Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/events/blink/input_scroll_elasticity_controller_unittest.cc
diff --git a/ui/events/blink/input_scroll_elasticity_controller_unittest.cc b/ui/events/blink/input_scroll_elasticity_controller_unittest.cc
index 6241da239b1d22bf75744abbc7a02b2ff33ffa25..00210d453888062a549b5dbc0e98136bfbbe1154 100644
--- a/ui/events/blink/input_scroll_elasticity_controller_unittest.cc
+++ b/ui/events/blink/input_scroll_elasticity_controller_unittest.cc
@@ -53,6 +53,10 @@ class MockScrollElasticityHelper : public cc::ScrollElasticityHelper {
}
void RequestOneBeginFrame() override { request_begin_frame_count_ += 1; }
+ base::WeakPtr<ScrollElasticityHelper> GetWeakPtr() override {
+ return nullptr;
+ }
+
// Counters for number of times functions were called.
int request_begin_frame_count() const { return request_begin_frame_count_; }
int set_stretch_amount_count() const { return set_stretch_amount_count_; }
@@ -80,8 +84,7 @@ class MockScrollElasticityHelper : public cc::ScrollElasticityHelper {
class ScrollElasticityControllerTest : public testing::Test {
public:
ScrollElasticityControllerTest()
- : controller_(&helper_),
- input_event_count_(0),
+ : input_event_count_(0),
current_time_(base::TimeTicks::FromInternalValue(100000000ull)) {}
~ScrollElasticityControllerTest() override {}

Powered by Google App Engine
This is Rietveld 408576698