Move VISUAL_STATE promise to activation

content/renderer/render_widget.h

Index: content/renderer/render_widget.h
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index df4f62f0e485c3fbaa88c2e471add10b87326e99..68151451c60ba8daba527e77d4be1ba3c06f09e9 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -69,7 +69,7 @@ class WebView;
 namespace cc {
 struct InputHandlerScrollResult;
 class OutputSurface;
-class SwapPromise;
+class Promise;
 }
 
 namespace gfx {
@@ -79,7 +79,7 @@ class Range;
 namespace content {
 class CompositorDependencies;
 class ExternalPopupMenu;
-class FrameSwapMessageQueue;
+class FrameUpdateMessageQueue;
 class PepperPluginInstanceImpl;
 class RenderFrameImpl;
 class RenderFrameProxy;
@@ -496,10 +496,10 @@ class CONTENT_EXPORT RenderWidget
 
   // QueueMessage implementation extracted into a static method for easy
   // testing.
-  static scoped_ptr<cc::SwapPromise> QueueMessageImpl(
+  static scoped_ptr<cc::Promise> QueueMessageImpl(
       IPC::Message* msg,
       MessageDeliveryPolicy policy,
-      FrameSwapMessageQueue* frame_swap_message_queue,
+      FrameUpdateMessageQueue* frame_update_message_queue,
       scoped_refptr<IPC::SyncMessageFilter> sync_message_filter,
       int source_frame_number);
 
@@ -793,7 +793,7 @@ class CONTENT_EXPORT RenderWidget
   gfx::PointF popup_screen_origin_for_emulation_;
   float popup_origin_scale_for_emulation_;
 
-  scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
+  scoped_refptr<FrameUpdateMessageQueue> frame_update_message_queue_;
   scoped_ptr<ResizingModeSelector> resizing_mode_selector_;
 
   // Lists of RenderFrameProxy objects that need to be notified of