cc: Add SwapPromiseManager and SurfaceSequenceGenerator.

content/renderer/gpu/render_widget_compositor.cc

Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index b548f9d2bcdb33fee5bbb03bae13c62ae2c948ac..2030e10135b50be1c2f969ddfbf7aa99f46d7152 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -38,9 +38,11 @@
 #include "cc/proto/compositor_message.pb.h"
 #include "cc/resources/single_release_callback.h"
 #include "cc/scheduler/begin_frame_source.h"
+#include "cc/surfaces/surface_sequence_generator.h"
 #include "cc/trees/latency_info_swap_promise_monitor.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/remote_proto_channel.h"
+#include "cc/trees/swap_promise_manager.h"
 #include "content/common/content_switches_internal.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/layer_tree_settings_factory.h"
@@ -625,13 +627,14 @@ std::unique_ptr<cc::SwapPromiseMonitor>
 RenderWidgetCompositor::CreateLatencyInfoSwapPromiseMonitor(
     ui::LatencyInfo* latency) {
   return std::unique_ptr<cc::SwapPromiseMonitor>(
-      new cc::LatencyInfoSwapPromiseMonitor(latency, layer_tree_host_.get(),
-                                            NULL));
+      new cc::LatencyInfoSwapPromiseMonitor(
+          latency, layer_tree_host_->GetSwapPromiseManager(), NULL));
 }
 
 void RenderWidgetCompositor::QueueSwapPromise(
     std::unique_ptr<cc::SwapPromise> swap_promise) {
-  layer_tree_host_->QueueSwapPromise(std::move(swap_promise));
+  layer_tree_host_->GetSwapPromiseManager()->QueueSwapPromise(
+      std::move(swap_promise));
 }
 
 int RenderWidgetCompositor::GetSourceFrameNumber() const {
@@ -930,7 +933,7 @@ void RenderWidgetCompositor::compositeAndReadbackAsync(
                                              callback, base::Passed(&result)));
           },
           callback, base::Passed(&main_thread_task_runner)));
-  layer_tree_host_->QueueSwapPromise(
+  layer_tree_host_->GetSwapPromiseManager()->QueueSwapPromise(
       delegate_->RequestCopyOfOutputForLayoutTest(std::move(request)));
 
   // Force a commit to happen. The temporary copy output request will
@@ -1124,7 +1127,8 @@ void RenderWidgetCompositor::SendCompositorProto(
 }
 
 void RenderWidgetCompositor::SetSurfaceClientId(uint32_t surface_client_id) {
-  layer_tree_host_->SetSurfaceClientId(surface_client_id);
+  layer_tree_host_->GetSurfaceSequenceGenerator()->set_surface_client_id(
+      surface_client_id);
 }
 
 void RenderWidgetCompositor::OnHandleCompositorProto(