[WIP] cc: Plumb SurfaceId from clients

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 0a7d8c04bcd2c9faa7829cd518c1c9f402222e64..0c95bf83972e829394b1dccf12661725619ff2da 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -546,6 +546,7 @@ void RenderWidgetHostViewAndroid::UnlockCompositingSurface() {
   if (locks_on_frame_count_ == 0) {
     if (last_frame_info_) {
       InternalSwapCompositorFrame(last_frame_info_->output_surface_id,
+                                  cc::SurfaceId(),
                                   std::move(last_frame_info_->frame));
       last_frame_info_.reset();
     }
@@ -1021,6 +1022,7 @@ void RenderWidgetHostViewAndroid::SubmitCompositorFrame(
 
 void RenderWidgetHostViewAndroid::InternalSwapCompositorFrame(
     uint32_t output_surface_id,
+    const cc::SurfaceId& surface_id,
     cc::CompositorFrame frame) {
   last_scroll_offset_ = frame.metadata.root_scroll_offset;
   DCHECK(frame.delegated_frame_data);
@@ -1070,8 +1072,9 @@ void RenderWidgetHostViewAndroid::InternalSwapCompositorFrame(
 
 void RenderWidgetHostViewAndroid::OnSwapCompositorFrame(
     uint32_t output_surface_id,
+    const cc::SurfaceId& surface_id,
     cc::CompositorFrame frame) {
-  InternalSwapCompositorFrame(output_surface_id, std::move(frame));
+  InternalSwapCompositorFrame(output_surface_id, surface_id, std::move(frame));
 }
 
 void RenderWidgetHostViewAndroid::ClearCompositorFrame() {