Android: Remove |InternalAccessDelegate.awakenScrollBars|

The method is used for ContentView only. Moved the logic to
ContentView, and deleted the interface from InternalAccessDelegate.

Bug: 598880
Change-Id: Ic07e2545b070e11d5653fd135d7396c65721cf71
Reviewed-on: https://chromium-review.googlesource.com/991620Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547846}

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

@@ -2302,11 +2302,6 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
             }
         }
 
-        @Override
-        public boolean super_awakenScrollBars(int arg0, boolean arg1) {
-            return false;
-        }
-
         @Override
         public void onScrollChanged(int l, int t, int oldl, int oldt) {
             // Intentional no-op.

android_webview/java/src/org/chromium/android_webview/FullScreenView.java

@@ -238,11 +238,6 @@ public class FullScreenView extends FrameLayout {
                     + "See AwContents#startActivityForResult");
         }
 
-        @Override
-        public boolean super_awakenScrollBars(int startDelay, boolean invalidate) {
-            return FullScreenView.super.awakenScrollBars(startDelay, invalidate);
-        }
-
         @Override
         public void onScrollChanged(int lPix, int tPix, int oldlPix, int oldtPix) {
             FullScreenView.this.onScrollChanged(lPix, tPix, oldlPix, oldtPix);

android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java

@@ -549,11 +549,6 @@ public class AwTestContainerView extends FrameLayout {
             AwTestContainerView.super.onScrollChanged(l, t, oldl, oldt);
         }
 
-        @Override
-        public boolean super_awakenScrollBars(int startDelay, boolean invalidate) {
-            return AwTestContainerView.super.awakenScrollBars(startDelay, invalidate);
-        }
-
         @Override
         public void setMeasuredDimension(int measuredWidth, int measuredHeight) {
             AwTestContainerView.super.setMeasuredDimension(measuredWidth, measuredHeight);

components/content_view/java/src/org/chromium/components/content_view/ContentView.java

@@ -303,9 +303,11 @@ public class ContentView
 
     @Override
     public boolean awakenScrollBars(int startDelay, boolean invalidate) {
-        ContentViewCore cvc = getContentViewCore();
-        assert cvc != null;
-        return cvc.awakenScrollBars(startDelay, invalidate);
+        // For the default implementation of ContentView which draws the scrollBars on the native
+        // side, calling this function may get us into a bad state where we keep drawing the
+        // scrollBars, so disable it by always returning false.
+        if (getScrollBarStyle() == View.SCROLLBARS_INSIDE_OVERLAY) return false;
+        return super.awakenScrollBars(startDelay, invalidate);
     }
 
     @Override
@@ -358,11 +360,6 @@ public class ContentView
         super.onConfigurationChanged(newConfig);
     }
 
-    @Override
-    public boolean super_awakenScrollBars(int startDelay, boolean invalidate) {
-        return super.awakenScrollBars(startDelay, invalidate);
-    }
-
     ///////////////////////////////////////////////////////////////////////////////////////////////
     //                End Implementation of ContentViewCore.InternalAccessDelegate               //
     ///////////////////////////////////////////////////////////////////////////////////////////////

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

@@ -13,7 +13,6 @@ import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.Surface;
-import android.view.View;
 import android.view.ViewGroup;
 
 import org.chromium.base.ObserverList;
@@ -579,19 +578,6 @@ public class ContentViewCoreImpl implements ContentViewCore, DisplayAndroidObser
 
     // End FrameLayout overrides.
 
-    @SuppressWarnings("javadoc")
-    @Override
-    public boolean awakenScrollBars(int startDelay, boolean invalidate) {
-        // For the default implementation of ContentView which draws the scrollBars on the native
-        // side, calling this function may get us into a bad state where we keep drawing the
-        // scrollBars, so disable it by always returning false.
-        if (mContainerView.getScrollBarStyle() == View.SCROLLBARS_INSIDE_OVERLAY) {
-            return false;
-        } else {
-            return mContainerViewInternals.super_awakenScrollBars(startDelay, invalidate);
-        }
-    }
-
     @Override
     public void updateMultiTouchZoomSupport(boolean supportsMultiTouchZoom) {
         if (mNativeContentViewCore == 0) return;

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

@@ -80,11 +80,6 @@ public interface ContentViewCore {
          * @see View#onScrollChanged(int, int, int, int)
          */
         void onScrollChanged(int lPix, int tPix, int oldlPix, int oldtPix);
-
-        /**
-         * @see View#awakenScrollBars(int, boolean)
-         */
-        boolean super_awakenScrollBars(int startDelay, boolean invalidate);
     }
 
     /**
@@ -249,11 +244,6 @@ public interface ContentViewCore {
      */
     int computeVerticalScrollExtent();
 
-    /**
-     * @see View#awakenScrollBars(int, boolean)
-     */
-    boolean awakenScrollBars(int startDelay, boolean invalidate);
-
     /**
      * Enable or disable multi-touch zoom support.
      * @param supportsMultiTouchZoom {@code true} if the feature is enabled.

content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java

@@ -78,11 +78,6 @@ public class ContentViewScrollingTest {
             }
         }
 
-        @Override
-        public boolean super_awakenScrollBars(int startDelay, boolean invalidate) {
-            return false;
-        }
-
         /**
          * @return Whether OnScrollChanged() has been called.
          */

content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewCore.java

@@ -121,11 +121,6 @@ public class TestContentViewCore implements ContentViewCore {
         return 0;
     }
 
-    @Override
-    public boolean awakenScrollBars(int startDelay, boolean invalidate) {
-        return false;
-    }
-
     @Override
     public void updateMultiTouchZoomSupport(boolean supportsMultiTouchZoom) {}