Separate SwipeRefreshHandler and ContentViewCore

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 4debfaf04922e3ccba3b988ece35c4c3bd0260b8..27129e9ad29ee40f5913f838a88ce48c436d8921 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -293,9 +293,7 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
     private SelectPopup mSelectPopup;
     private long mNativeSelectPopupSourceFrame;
 
-    private OverscrollRefreshHandler mOverscrollRefreshHandler;
-
-    private Runnable mFakeMouseMoveRunnable;
+    private Runnable mFakeMouseMoveRunnable = null;
 
     // Only valid when focused on a text / password field.
     private ImeAdapter mImeAdapter;
@@ -690,7 +688,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
         try {
             TraceEvent.begin("ContentViewCore.setContainerView");
             if (mContainerView != null) {
-                assert mOverscrollRefreshHandler == null;
                 hideSelectPopupWithCancelMessage();
                 mPopupZoomer.hide(false);
             }
@@ -811,7 +808,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
         // in this class.
         mContentViewClient = new ContentViewClient();
         mWebContents = null;
-        mOverscrollRefreshHandler = null;
         mNativeContentViewCore = 0;
         mJavaScriptInterfaces.clear();
         mRetainedJavaScriptObjects.clear();
@@ -2061,40 +2057,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
         return new MotionEventSynthesizer(this);
     }
 
-    /**
-     * Initialize the view with an overscroll refresh handler.
-     * @param handler The refresh handler.
-     */
-    public void setOverscrollRefreshHandler(OverscrollRefreshHandler handler) {
-        assert mOverscrollRefreshHandler == null || handler == null;
-        mOverscrollRefreshHandler = handler;
-    }
-
-    @SuppressWarnings("unused")
-    @CalledByNative
-    private boolean onOverscrollRefreshStart() {
-        if (mOverscrollRefreshHandler == null) return false;
-        return mOverscrollRefreshHandler.start();
-    }
-
-    @SuppressWarnings("unused")
-    @CalledByNative
-    private void onOverscrollRefreshUpdate(float delta) {
-        if (mOverscrollRefreshHandler != null) mOverscrollRefreshHandler.pull(delta);
-    }
-
-    @SuppressWarnings("unused")
-    @CalledByNative
-    private void onOverscrollRefreshRelease(boolean allowRefresh) {
-        if (mOverscrollRefreshHandler != null) mOverscrollRefreshHandler.release(allowRefresh);
-    }
-
-    @SuppressWarnings("unused")
-    @CalledByNative
-    private void onOverscrollRefreshReset() {
-        if (mOverscrollRefreshHandler != null) mOverscrollRefreshHandler.reset();
-    }
-
     @SuppressWarnings("unused")
     @CalledByNative
     private void onSelectionChanged(String text) {