Update from https://crrev.com/320931

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/base/swap_promise.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) {}
 
@@ skipping 95 matching lines @@
   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());
   destroy_sequence_ = SurfaceSequence();
 }
 
 }  // namespace cc