Move VISUAL_STATE promise to activation

content/browser/android/in_process/synchronous_compositor_output_surface.h

Index: content/browser/android/in_process/synchronous_compositor_output_surface.h
diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.h b/content/browser/android/in_process/synchronous_compositor_output_surface.h
index 414695230c10f978ff18ec3758c012c9d5e9465e..1436ef08bda4ea0be3a89ef393b614604090df55 100644
--- a/content/browser/android/in_process/synchronous_compositor_output_surface.h
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.h
@@ -30,7 +30,7 @@ class Message;
 
 namespace content {
 
-class FrameSwapMessageQueue;
+class FrameUpdateMessageQueue;
 class SynchronousCompositorClient;
 class SynchronousCompositorImpl;
 class SynchronousCompositorOutputSurface;
@@ -51,7 +51,7 @@ class SynchronousCompositorOutputSurface
       const scoped_refptr<cc::ContextProvider>& context_provider,
       const scoped_refptr<cc::ContextProvider>& worker_context_provider,
       int routing_id,
-      scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue);
+      scoped_refptr<FrameUpdateMessageQueue> frame_update_message_queue);
   ~SynchronousCompositorOutputSurface() override;
 
   void SetCompositor(SynchronousCompositorImpl* compositor);
@@ -74,7 +74,7 @@ class SynchronousCompositorOutputSurface
   scoped_ptr<cc::CompositorFrame> DemandDrawSw(SkCanvas* canvas);
   void SetMemoryPolicy(size_t bytes_limit);
   void SetTreeActivationCallback(const base::Closure& callback);
-  void GetMessagesToDeliver(ScopedVector<IPC::Message>* messages);
+  void GetSwapMessagesToDeliver(ScopedVector<IPC::Message>* messages);
 
   size_t GetMemoryPolicy() const {
     return memory_policy_.bytes_limit_when_visible;
@@ -111,7 +111,7 @@ class SynchronousCompositorOutputSurface
 
   scoped_ptr<cc::CompositorFrame> frame_holder_;
 
-  scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
+  scoped_refptr<FrameUpdateMessageQueue> frame_update_message_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorOutputSurface);
 };