Android: Move scheduling logic to CompositorImpl

ui/base/android/window_android.cc

 // Copyright 2013 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 "ui/base/android/window_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 78 matching lines @@
                     OnDetachCompositor());
   observer_list_.Clear();
 }
 
 void WindowAndroid::RequestVSyncUpdate() {
   JNIEnv* env = AttachCurrentThread();
   Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject().obj());
 }
 
 void WindowAndroid::OnVSync(JNIEnv* env, jobject obj, jlong time_micros) {
+  base::TimeTicks frame_time(base::TimeTicks::FromInternalValue(time_micros));
   FOR_EACH_OBSERVER(
       WindowAndroidObserver,
       observer_list_,
-      OnVSync(base::TimeTicks::FromInternalValue(time_micros), vsync_period_));
+      OnVSync(frame_time, vsync_period_));
+  if (compositor_)
+    compositor_->OnVSync(frame_time, vsync_period_);
 }
 
 // ----------------------------------------------------------------------------
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) {
   WindowAndroid* window = new WindowAndroid(env, obj, vsync_period);
   return reinterpret_cast<intptr_t>(window);
 }
 
 }  // namespace ui