sync compositor: Move DeliverMessages to OutputSurface

content/renderer/android/synchronous_compositor_output_surface.h

Index: content/renderer/android/synchronous_compositor_output_surface.h
diff --git a/content/renderer/android/synchronous_compositor_output_surface.h b/content/renderer/android/synchronous_compositor_output_surface.h
index 71f3c981a38063abc6267a544f1865bcd8fc2ad8..672cf2d234cf724230974aac3076654d7c85e9b1 100644
--- a/content/renderer/android/synchronous_compositor_output_surface.h
+++ b/content/renderer/android/synchronous_compositor_output_surface.h
@@ -8,7 +8,6 @@
 #include <stddef.h>
 
 #include <memory>
-#include <vector>
 
 #include "base/callback.h"
 #include "base/cancelable_callback.h"
@@ -40,6 +39,7 @@ class WebGraphicsContext3DCommandBufferImpl;
 
 class SynchronousCompositorOutputSurfaceClient {
  public:
+  virtual void DidActivatePendingTree() = 0;
   virtual void Invalidate() = 0;
   virtual void SwapBuffers(uint32_t output_surface_id,
                            cc::CompositorFrame* frame) = 0;
@@ -88,9 +88,6 @@ class SynchronousCompositorOutputSurface
                     const gfx::Rect& viewport_rect_for_tile_priority,
                     const gfx::Transform& transform_for_tile_priority);
   void DemandDrawSw(SkCanvas* canvas);
-  void SetTreeActivationCallback(const base::Closure& callback);
-  void GetMessagesToDeliver(
-      std::vector<std::unique_ptr<IPC::Message>>* messages);
 
  private:
   class SoftwareDevice;
@@ -101,6 +98,8 @@ class SynchronousCompositorOutputSurface
                        const gfx::Rect& clip,
                        bool hardware_draw);
   bool Send(IPC::Message* message);
+  void DidActivatePendingTree();
+  void DeliverMessages();
   bool CalledOnValidThread() const;
 
   void CancelFallbackTick();