Move VISUAL_STATE promise to activation

cc/trees/layer_tree_host.h

Index: cc/trees/layer_tree_host.h
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index f88f822e8d337f59633190207087a65b541fbdbe..778a1d56dda6b884bb1edf08247f16e02d372115 100644
--- a/cc/trees/layer_tree_host.h
+++ b/cc/trees/layer_tree_host.h
@@ -30,7 +30,8 @@
 #include "cc/layers/layer_lists.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/renderer_capabilities.h"
-#include "cc/output/swap_promise.h"
+#include "cc/output/promise.h"
+#include "cc/output/promise_list.h"
 #include "cc/resources/resource_format.h"
 #include "cc/resources/scoped_ui_resource.h"
 #include "cc/surfaces/surface_sequence.h"
@@ -291,11 +292,12 @@ class CC_EXPORT LayerTreeHost {
 
   // Call this function when you expect there to be a swap buffer.
   // See swap_promise.h for how to use SwapPromise.
-  void QueueSwapPromise(scoped_ptr<SwapPromise> swap_promise);
+  void QueuePromise(scoped_ptr<Promise> promise);
 
-  void BreakSwapPromises(SwapPromise::DidNotSwapReason reason);
+  size_t num_queued_promises() const { return promises_.size(); }
 
-  size_t num_queued_swap_promises() const { return swap_promise_list_.size(); }
+  void BreakSwapPromises(Promise::DidNotSwap::Reason reason);
+  void BreakActivationPromises(Promise::DidNotActivate::Reason reason);
 
   void set_surface_id_namespace(uint32_t id_namespace);
   SurfaceSequence CreateSurfaceSequence();
@@ -446,7 +448,7 @@ class CC_EXPORT LayerTreeHost {
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
   TaskGraphRunner* task_graph_runner_;
 
-  ScopedPtrVector<SwapPromise> swap_promise_list_;
+  PromiseList promises_;
   std::set<SwapPromiseMonitor*> swap_promise_monitor_;
 
   PropertyTrees property_trees_;