Move context-related callbacks into OutputSurface

cc/layer_tree_host_impl.h

Index: cc/layer_tree_host_impl.h
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index 00e9ea28240fc49b3950adfb29c351b7a9bf2972..d25ec2a58310c2c76ea20dbdc032b69856553700 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -127,8 +127,6 @@ public:
     // RendererClient implementation
     virtual const gfx::Size& deviceViewportSize() const OVERRIDE;
     virtual const LayerTreeSettings& settings() const OVERRIDE;
-    virtual void didLoseOutputSurface() OVERRIDE;
-    virtual void onSwapBuffersComplete() OVERRIDE;
     virtual void setFullRootLayerDamage() OVERRIDE;
     virtual void setManagedMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE;
     virtual void enforceManagedMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE;
@@ -143,6 +141,8 @@ public:
     // OutputSurfaceClient implementation.
     virtual void OnVSyncParametersChanged(base::TimeTicks timebase, base::TimeDelta interval) OVERRIDE;
     virtual void OnSendFrameToParentCompositorAck(const CompositorFrameAck&) OVERRIDE;
+    virtual void OnSwapBuffersComplete() OVERRIDE;
+    virtual void DidLoseOutputSurface() OVERRIDE;
 
     // Called from LayerTreeImpl.
     void OnCanDrawStateChangedForTree(LayerTreeImpl*);