cc: Complete swap promise for aborted commit after pending activation.

cc/trees/layer_tree_host.cc

Index: cc/trees/layer_tree_host.cc
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index f295efcfaca6ea2c8cdaf8b5fbe7946151a5bcca..822d1b8ccee599be9d71e0d530f2a17f075356ce 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -515,7 +515,7 @@ void LayerTreeHost::FinishCommitOnImplThread(LayerTreeHostImpl* host_impl) {
   if (sync_tree->IsActiveTree())
     sync_tree->elastic_overscroll()->PushPendingToActive();
 
-  sync_tree->PassSwapPromises(&swap_promise_list_);
+  sync_tree->PassSwapPromises(std::move(swap_promise_list_));
 
   sync_tree->set_top_controls_shrink_blink_size(
       top_controls_shrink_blink_size_);
@@ -1297,6 +1297,12 @@ void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) {
   swap_promise_list_.clear();
 }
 
+std::vector<std::unique_ptr<SwapPromise>> LayerTreeHost::TakeSwapPromises() {
+  std::vector<std::unique_ptr<SwapPromise>> to_return;
+  to_return.swap(swap_promise_list_);
+  return to_return;
+}
+
 void LayerTreeHost::OnCommitForSwapPromises() {
   for (const auto& swap_promise : swap_promise_list_)
     swap_promise->OnCommit();