Move VISUAL_STATE promise to activation

cc/trees/single_thread_proxy.cc

Index: cc/trees/single_thread_proxy.cc
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index 855d980d757ee2b945bd904ee522bae62cab1af6..91744acf9f4aab5057dd81985defdf5b351a7e84 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -614,7 +614,7 @@ void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) {
     DoBeginMainFrame(begin_frame_args);
     DoCommit();
 
-    DCHECK_EQ(0u, layer_tree_host_->num_queued_swap_promises())
+    DCHECK_EQ(0u, layer_tree_host_->num_queued_promises())
         << "Commit should always succeed and transfer promises.";
   }
 
@@ -637,7 +637,7 @@ void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) {
     // DoComposite could abort, but because this is a synchronous composite
     // another draw will never be scheduled, so break remaining promises.
     layer_tree_host_impl_->active_tree()->BreakSwapPromises(
-        SwapPromise::SWAP_FAILS);
+        Promise::DidNotSwap::SWAP_FAILS);
 
     DidBeginImplFrameDeadline();
   }