Chromium Code Reviews| Index: ui/android/overscroll_refresh_unittest.cc |
| diff --git a/ui/android/overscroll_refresh_unittest.cc b/ui/android/overscroll_refresh_unittest.cc |
| index 39a8b308a33a3ee26c6dde2a9d36ca618530e45c..8cfee1e827d87ea582aa76051d69f457eb14e272 100644 |
| --- a/ui/android/overscroll_refresh_unittest.cc |
| +++ b/ui/android/overscroll_refresh_unittest.cc |
| @@ -2,6 +2,7 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| +#include "base/android/scoped_java_ref.h" |
| #include "cc/layers/layer.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| #include "ui/android/overscroll_refresh.h" |
| @@ -11,22 +12,23 @@ namespace ui { |
| class OverscrollRefreshTest : public OverscrollRefreshHandler, |
| public testing::Test { |
| public: |
| - OverscrollRefreshTest() {} |
| + OverscrollRefreshTest() |
| + : OverscrollRefreshHandler(base::android::JavaRef<jobject>()) {} |
| // OverscrollRefreshHandler implementation. |
| - bool PullStart() override { |
| + bool PullStart() { |
|
boliu
2016/12/03 01:05:28
why remove overrides?
rlanday
2016/12/05 19:53:57
The override keyword can only be used with virtual
boliu
2016/12/06 00:46:34
Err, then are you sure this test still works? I th
|
| started_ = true; |
| return true; |
| } |
| - void PullUpdate(float delta) override { delta_ += delta; } |
| + void PullUpdate(float delta) { delta_ += delta; } |
| - void PullRelease(bool allow_refresh) override { |
| + void PullRelease(bool allow_refresh) { |
| released_ = true; |
| refresh_allowed_ = allow_refresh; |
| } |
| - void PullReset() override { reset_ = true; } |
| + void PullReset() { reset_ = true; } |
| bool GetAndResetPullStarted() { |
| bool result = started_; |