Separate SwipeRefreshHandler and ContentViewCore

ui/android/overscroll_refresh_unittest.cc

 // 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.
 
+#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"
 
 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 methods. Since the
OverscrollRefreshHandler class is becoming something that just forwards all the
method calls to a Java implementation instead of being overridden itself, the
methods are no longer virtual.

[boliu, 2016/12/06 00:46:34]

Err, then are you sure this test still works? I think none of these methods will
be called then, because test always calls things through the parent type?

I think the parent needs to declare these as virtual, just because they are
overridden in tests. So do that and add a comment.

     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_;
     started_ = false;
     return result;
   }
 
   float GetAndResetPullDelta() {
     float result = delta_;
     delta_ = 0;
@@ skipping 192 matching lines @@
   EXPECT_TRUE(GetAndResetPullStarted());
 
   // An early reset should prevent the refresh action from firing.
   effect.Reset();
   EXPECT_TRUE(GetAndResetPullReset());
   effect.OnScrollEnd(gfx::Vector2dF());
   EXPECT_FALSE(GetAndResetPullReleased());
 }
 
 }  // namespace ui