cc: Implement unified BeginFrame 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 d3d8f2630ce8721e537406032b77220ece18d42a..0913aa78870c929cdff7304e1eb9e50fb1d99778 100644
--- a/content/browser/compositor/browser_compositor_output_surface.h
+++ b/content/browser/compositor/browser_compositor_output_surface.h
@@ -8,7 +8,6 @@
 #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;
@@ -20,18 +19,13 @@ class ReflectorImpl;
 class WebGraphicsContext3DCommandBufferImpl;
 
 class CONTENT_EXPORT BrowserCompositorOutputSurface
-    : public cc::OutputSurface,
-      public ui::CompositorVSyncManager::Observer {
+    : public cc::OutputSurface {
  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);
 
@@ -45,16 +39,13 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface
 
  protected:
   // Constructor used by the accelerated implementation.
-  BrowserCompositorOutputSurface(
-      const scoped_refptr<cc::ContextProvider>& context,
-      const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager);
+  explicit BrowserCompositorOutputSurface(
+      const scoped_refptr<cc::ContextProvider>& context);
 
   // Constructor used by the software implementation.
-  BrowserCompositorOutputSurface(
-      scoped_ptr<cc::SoftwareOutputDevice> software_device,
-      const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager);
+  explicit BrowserCompositorOutputSurface(
+      scoped_ptr<cc::SoftwareOutputDevice> software_device);
 
-  scoped_refptr<ui::CompositorVSyncManager> vsync_manager_;
   ReflectorImpl* reflector_;
 
  private: