Move VISUAL_STATE promise to activation

content/browser/android/in_process/synchronous_compositor_factory_impl.cc

Index: content/browser/android/in_process/synchronous_compositor_factory_impl.cc
diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
index 812f60bc4c9761a01c3ed171e38351b9bcdf3edd..f66ab79829aefe7daaf44a26311db631c34c5f23 100644
--- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
+++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
@@ -11,7 +11,7 @@
 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
 #include "content/browser/android/in_process/synchronous_compositor_output_surface.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/renderer/gpu/frame_swap_message_queue.h"
+#include "content/renderer/gpu/frame_update_message_queue.h"
 #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ -148,14 +148,14 @@ SynchronousCompositorFactoryImpl::RecordFullLayer() {
 scoped_ptr<cc::OutputSurface>
 SynchronousCompositorFactoryImpl::CreateOutputSurface(
     int routing_id,
-    scoped_refptr<content::FrameSwapMessageQueue> frame_swap_message_queue) {
+    scoped_refptr<content::FrameUpdateMessageQueue> frame_update_message_queue) {
   scoped_refptr<cc::ContextProvider> onscreen_context =
       CreateContextProviderForCompositor();
   scoped_refptr<cc::ContextProvider> worker_context =
       CreateContextProviderForCompositor();
 
   return make_scoped_ptr(new SynchronousCompositorOutputSurface(
-      onscreen_context, worker_context, routing_id, frame_swap_message_queue));
+      onscreen_context, worker_context, routing_id, frame_update_message_queue));
 }
 
 InputHandlerManagerClient*