Android: Move scheduling logic to CompositorImpl

content/browser/android/content_view_render_view.h

Index: content/browser/android/content_view_render_view.h
diff --git a/content/browser/android/content_view_render_view.h b/content/browser/android/content_view_render_view.h
index 8f14456fda4b67a3594f481c43040f387e6e1f0c..cbdb1f19b40f11e039e99e813e3b08e633456295 100644
--- a/content/browser/android/content_view_render_view.h
+++ b/content/browser/android/content_view_render_view.h
@@ -43,18 +43,15 @@ class ContentViewRenderView : public CompositorClient {
   jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap);
   void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled);
 
-  // CompositorClient ---------------------------------------------------------
-  virtual void ScheduleComposite() OVERRIDE;
-  virtual void OnSwapBuffersPosted() OVERRIDE;
-  virtual void OnSwapBuffersCompleted() OVERRIDE;
+  // CompositorClient implementation
+  virtual void Layout() OVERRIDE;
+  virtual void OnSwapBuffersCompleted(int pending_swap_buffers) OVERRIDE;
 
  private:
   virtual ~ContentViewRenderView();
 
   void InitCompositor();
 
-  bool buffers_swapped_during_composite_;
-
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;
   scoped_ptr<LayerTreeBuildHelper> layer_tree_build_helper_;