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

cc/trees/layer_tree_host_impl.h

Index: cc/trees/layer_tree_host_impl.h
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index 0870291de8104482be4cb8a6307652b1bc1c7434..25c4b807d6cedab21bb49321148849e54374168a 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -235,7 +235,9 @@ class CC_EXPORT LayerTreeHostImpl
     DISALLOW_COPY_AND_ASSIGN(FrameData);
   };
 
-  virtual void BeginMainFrameAborted(CommitEarlyOutReason reason);
+  virtual void BeginMainFrameAborted(
+      CommitEarlyOutReason reason,
+      std::vector<std::unique_ptr<SwapPromise>> swap_promises);
   virtual void ReadyToCommit() {}  // For tests.
   virtual void BeginCommit();
   virtual void CommitComplete();
@@ -489,18 +491,10 @@ class CC_EXPORT LayerTreeHostImpl
     max_memory_needed_bytes_ = bytes;
   }
 
-  FrameRateCounter* fps_counter() {
-    return fps_counter_.get();
-  }
-  MemoryHistory* memory_history() {
-    return memory_history_.get();
-  }
-  DebugRectHistory* debug_rect_history() {
-    return debug_rect_history_.get();
-  }
-  ResourceProvider* resource_provider() {
-    return resource_provider_.get();
-  }
+  FrameRateCounter* fps_counter() { return fps_counter_.get(); }
+  MemoryHistory* memory_history() { return memory_history_.get(); }
+  DebugRectHistory* debug_rect_history() { return debug_rect_history_.get(); }
+  ResourceProvider* resource_provider() { return resource_provider_.get(); }
   TopControlsManager* top_controls_manager() {
     return top_controls_manager_.get();
   }