Move VISUAL_STATE promise to activation

cc/layers/surface_layer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/surface_layer.h"
 
 #include "cc/layers/surface_layer_impl.h"
 #include "cc/output/swap_promise.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
 
 class SatisfySwapPromise : public SwapPromise {
  public:
   SatisfySwapPromise(SurfaceSequence sequence,
                      const SurfaceLayer::SatisfyCallback& satisfy_callback)
       : sequence_(sequence), satisfy_callback_(satisfy_callback) {}
 
   ~SatisfySwapPromise() override {}
 
  private:
   void DidSwap(CompositorFrameMetadata* metadata) override {
     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; }
 
   SurfaceSequence sequence_;
   SurfaceLayer::SatisfyCallback satisfy_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(SatisfySwapPromise);
 };
 
@@ skipping 72 matching lines @@
     require_callback_.Run(surface_id_, destroy_sequence_);
   }
 }
 
 void SurfaceLayer::SatisfyDestroySequence() {
   if (!layer_tree_host())
     return;
   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();
 }
 
 }  // namespace cc