Move context-related callbacks into OutputSurface

cc/output/gl_renderer.h

Index: cc/output/gl_renderer.h
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
index e6a668d2086386442426039228e7ef1553f0650e..539ffea23ed48d4ff9f2ed27eec5105ae8bc3847 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -35,12 +35,7 @@ class CC_EXPORT GLRenderer :
     public DirectRenderer,
     public NON_EXPORTED_BASE(
         WebKit::WebGraphicsContext3D::
-            WebGraphicsSwapBuffersCompleteCallbackCHROMIUM),
-    public NON_EXPORTED_BASE(
-        WebKit::WebGraphicsContext3D::
-            WebGraphicsMemoryAllocationChangedCallbackCHROMIUM),
-    public NON_EXPORTED_BASE(
-        WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback) {
+            WebGraphicsMemoryAllocationChangedCallbackCHROMIUM) {
  public:
   static scoped_ptr<GLRenderer> Create(RendererClient* client,
                                        OutputSurface* output_surface,
@@ -54,9 +49,6 @@ class CC_EXPORT GLRenderer :
 
   virtual void ViewportChanged() OVERRIDE;
 
-  virtual void ReceiveCompositorFrameAck(const CompositorFrameAck& ack)
-      OVERRIDE;
-
   // Waits for rendering to finish.
   virtual void Finish() OVERRIDE;
 
@@ -176,11 +168,6 @@ class CC_EXPORT GLRenderer :
   void CleanupSharedObjects();
 
   // WebKit::
-  // WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM
-  // implementation.
-  virtual void onSwapBuffersComplete() OVERRIDE;
-
-  // WebKit::
   // WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM
   // implementation.
   virtual void onMemoryAllocationChanged(
@@ -189,9 +176,6 @@ class CC_EXPORT GLRenderer :
   void EnsureBackbuffer();
   void EnforceMemoryPolicy();
 
-  // WebGraphicsContext3D::WebGraphicsContextLostCallback implementation.
-  virtual void onContextLost() OVERRIDE;
-
   RendererCapabilities capabilities_;
 
   unsigned offscreen_framebuffer_id_;