Android: Move scheduling logic to CompositorImpl

ui/android/java/src/org/chromium/ui/base/WindowAndroid.java

Index: ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
diff --git a/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
index 547e582cecb11fa81bf1a71a81d906b26835ee63..c4fd324bb85a678e75a413d1d5d6f93a1f9bb85f 100644
--- a/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
+++ b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
@@ -32,7 +32,6 @@ public class WindowAndroid {
     // Native pointer to the c++ WindowAndroid object.
     private long mNativeWindowAndroid = 0;
     private final VSyncMonitor mVSyncMonitor;
-    private VSyncClient mVSyncClient = null;
 
     // A string used as a key to store intent errors in a bundle
     static final String WINDOW_CALLBACK_ERRORS = "window_callback_errors";
@@ -48,15 +47,6 @@ public class WindowAndroid {
     // the Android lint warning "UseSparseArrays".
     protected HashMap<Integer, String> mIntentErrors;
 
-    private final VSyncMonitor.Listener mVSyncListener = new VSyncMonitor.Listener() {
-       @Override public void onVSync(VSyncMonitor monitor,
-                                     long vsyncTimeMicros) {
-         if (mVSyncClient != null)
-           mVSyncClient.onVSync(vsyncTimeMicros);
-         nativeOnVSync(mNativeWindowAndroid, vsyncTimeMicros);
-       }
-    };
-
     /**
      * @param context The application context.
      */
@@ -228,28 +218,8 @@ public class WindowAndroid {
         return false;
     }
 
-    /**
-     * An interface to receive VSync notifications from the window.
-     * The one and only client is set with setVSyncClient(client).
-     */
-    public interface VSyncClient {
-        public void onVSync(long vsyncTimeMicros);
-    }
-
-    /**
-     * Sets the VSyncClient.
-     */
-    public void setVSyncClient(VSyncClient client) {
-       assert mVSyncClient == null || client == null;
-       mVSyncClient = client;
-    }
-
     @CalledByNative
-    /**
-     * Request a VSync callback.
-     * VSyncClient.onVSync() will be called at least once.
-     */
-    public void requestVSyncUpdate() {
+    private void requestVSyncUpdate() {
        mVSyncMonitor.requestUpdate();
     }