Move VISUAL_STATE promise to activation

cc/layers/surface_layer.cc

Index: cc/layers/surface_layer.cc
diff --git a/cc/layers/surface_layer.cc b/cc/layers/surface_layer.cc
index 1a690b6eb025e21522f9b76813c8e9ee914d077f..ae1782e90a5a4257ccb1ff544fae07626e743ccc 100644
--- a/cc/layers/surface_layer.cc
+++ b/cc/layers/surface_layer.cc
@@ -23,7 +23,7 @@ class SatisfySwapPromise : public SwapPromise {
     metadata->satisfies_sequences.push_back(sequence_.sequence);
   }
 
-  void DidNotSwap(DidNotSwapReason reason) override {
+  void DidNotSwap(DidNotSwap::Reason reason) override {
     satisfy_callback_.Run(sequence_);
   }
   int64 TraceId() const override { return 0; }
@@ -116,7 +116,7 @@ void SurfaceLayer::SatisfyDestroySequence() {
   DCHECK(!destroy_sequence_.is_null());
   scoped_ptr<SatisfySwapPromise> satisfy(
       new SatisfySwapPromise(destroy_sequence_, satisfy_callback_));
-  layer_tree_host()->QueueSwapPromise(satisfy.Pass());
+  layer_tree_host()->QueuePromise(satisfy.Pass());
   destroy_sequence_ = SurfaceSequence();
 }