Revert of Enable BeginFrame scheduling on aura

content/browser/compositor/browser_compositor_output_surface.h

Index: content/browser/compositor/browser_compositor_output_surface.h
diff --git a/content/browser/compositor/browser_compositor_output_surface.h b/content/browser/compositor/browser_compositor_output_surface.h
index 07ea6905de1a92d2fb8c3287994138684407d698..d3d8f2630ce8721e537406032b77220ece18d42a 100644
--- a/content/browser/compositor/browser_compositor_output_surface.h
+++ b/content/browser/compositor/browser_compositor_output_surface.h
@@ -8,6 +8,7 @@
 #include "base/threading/non_thread_safe.h"
 #include "cc/output/output_surface.h"
 #include "content/common/content_export.h"
+#include "ui/compositor/compositor_vsync_manager.h"
 
 namespace cc {
 class SoftwareOutputDevice;
@@ -19,9 +20,17 @@
 class WebGraphicsContext3DCommandBufferImpl;
 
 class CONTENT_EXPORT BrowserCompositorOutputSurface
-    : public cc::OutputSurface {
+    : public cc::OutputSurface,
+      public ui::CompositorVSyncManager::Observer {
  public:
   ~BrowserCompositorOutputSurface() override;
+
+  // cc::OutputSurface implementation.
+  bool BindToClient(cc::OutputSurfaceClient* client) override;
+
+  // ui::CompositorOutputSurface::Observer implementation.
+  void OnUpdateVSyncParameters(base::TimeTicks timebase,
+                               base::TimeDelta interval) override;
 
   void OnUpdateVSyncParametersFromGpu(base::TimeTicks tiembase,
                                       base::TimeDelta interval);
@@ -36,13 +45,16 @@
 
  protected:
   // Constructor used by the accelerated implementation.
-  explicit BrowserCompositorOutputSurface(
-      const scoped_refptr<cc::ContextProvider>& context);
+  BrowserCompositorOutputSurface(
+      const scoped_refptr<cc::ContextProvider>& context,
+      const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager);
 
   // Constructor used by the software implementation.
-  explicit BrowserCompositorOutputSurface(
-      scoped_ptr<cc::SoftwareOutputDevice> software_device);
+  BrowserCompositorOutputSurface(
+      scoped_ptr<cc::SoftwareOutputDevice> software_device,
+      const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager);
 
+  scoped_refptr<ui::CompositorVSyncManager> vsync_manager_;
   ReflectorImpl* reflector_;
 
  private: