Revert of cc: Make scheduling be driven by vsync for android webview.

content/browser/android/in_process/synchronous_compositor_output_surface.h

Index: content/browser/android/in_process/synchronous_compositor_output_surface.h
diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.h b/content/browser/android/in_process/synchronous_compositor_output_surface.h
index adc65b45ce8d6252d32dd256402c9f8ec1bcd75a..584bedc864f4725a1f94379821d42d690c30bb04 100644
--- a/content/browser/android/in_process/synchronous_compositor_output_surface.h
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.h
@@ -32,7 +32,7 @@
 
 class FrameSwapMessageQueue;
 class SynchronousCompositorClient;
-class SynchronousCompositorImpl;
+class SynchronousCompositorExternalBeginFrameSource;
 class SynchronousCompositorOutputSurface;
 class WebGraphicsContext3DCommandBufferImpl;
 
@@ -52,13 +52,13 @@
       scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue);
   ~SynchronousCompositorOutputSurface() override;
 
-  void SetCompositor(SynchronousCompositorImpl* compositor);
-
   // OutputSurface.
   bool BindToClient(cc::OutputSurfaceClient* surface_client) override;
   void Reshape(const gfx::Size& size, float scale_factor) override;
   void SwapBuffers(cc::CompositorFrame* frame) override;
-  void Invalidate() override;
+
+  void SetBeginFrameSource(
+      SynchronousCompositorExternalBeginFrameSource* begin_frame_source);
 
   // Partial SynchronousCompositor API implementation.
   bool InitializeHwDraw(
@@ -93,9 +93,6 @@
   const int routing_id_;
   bool registered_;
 
-  // Not owned.
-  SynchronousCompositorImpl* compositor_;
-
   gfx::Transform cached_hw_transform_;
   gfx::Rect cached_hw_viewport_;
   gfx::Rect cached_hw_clip_;
@@ -107,9 +104,12 @@
 
   cc::ManagedMemoryPolicy memory_policy_;
 
+  cc::OutputSurfaceClient* output_surface_client_;
   scoped_ptr<cc::CompositorFrame> frame_holder_;
 
   scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
+
+  SynchronousCompositorExternalBeginFrameSource* begin_frame_source_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorOutputSurface);
 };