[WIP] cc: Plumb SurfaceId from clients

content/browser/frame_host/render_widget_host_view_child_frame.h

Index: content/browser/frame_host/render_widget_host_view_child_frame.h
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.h b/content/browser/frame_host/render_widget_host_view_child_frame.h
index 74d535b84ed5d843170379a5752689c2a05c72d4..b9d0d683dce4d1d2ec539a604a4d2faeb121a139 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.h
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.h
@@ -117,6 +117,7 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   void GestureEventAck(const blink::WebGestureEvent& event,
                        InputEventAckState ack_result) override;
   void OnSwapCompositorFrame(uint32_t output_surface_id,
+                             const cc::SurfaceId& surface_id,
                              cc::CompositorFrame frame) override;
   // Since the URL of content rendered by this class is not displayed in
   // the URL bar, this method does not need an implementation.
@@ -200,8 +201,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   RenderWidgetHostImpl* host_;
 
   // Surface-related state.
-  std::unique_ptr<cc::SurfaceIdAllocator> id_allocator_;
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;
+  uint32_t surface_client_id_;
   cc::SurfaceId surface_id_;
   uint32_t next_surface_sequence_;
   uint32_t last_output_surface_id_;