Add xsurface data

Updated protos so we can access the xsurface data.
Updated proto converter to grab that data.

Bug: 1044139
Change-Id: I25e5f8584a0be4dc27c20ac8000cfa1957fc6fed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2105420Reviewed-by: Ian Wells <iwells@chromium.org>
Commit-Queue: Dan H <harringtond@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750630}

components/feed/core/proto/v2/wire/render_data.proto

@@ -18,5 +18,6 @@ message RenderData {
   }
   optional RenderDataType render_data_type = 1;
 
-  extensions 1000;  // ElementsRenderData
+  message XSurfaceContainer { optional bytes render_data = 1; }
+  optional XSurfaceContainer xsurface_container = 1000;
 }

components/feed/core/proto/v2/wire/stream_structure.proto

@@ -37,5 +37,7 @@ message Content {
   reserved 2;
 }
 
-// No fields used yet.
-message XSurfaceContent {}
+// Opaque data to for rendering a piece of content.
+message XSurfaceContent {
+  optional bytes xsurface_output = 1;
+}

components/feed/core/v2/stream_model_update_request.cc

@@ -74,9 +74,8 @@ bool TranslateFeature(feedwire::Feature* feature,
 
     *(result->content.mutable_content_id()) =
         result->stream_structure.content_id();
-    // TODO(iwells): We need the frame bytes.
-    // result->content
-    //   .set_allocated_frame(wire_content->release_xsurface_frame());
+    result->content.set_allocated_frame(
+        wire_content->mutable_xsurface_content()->release_xsurface_output());
     result->has_content = true;
   }
   return true;
@@ -91,9 +90,8 @@ base::Optional<feedstore::StreamSharedState> TranslateSharedState(
 
   feedstore::StreamSharedState shared_state;
   *shared_state.mutable_content_id() = std::move(content_id);
-  // TODO(iwells): We need the render data bytes.
-  // shared_state.set_allocated_shared_state_data(
-  //   wire_shared_state->release_shared_state_data());
+  shared_state.set_allocated_shared_state_data(
+      wire_shared_state->mutable_xsurface_container()->release_render_data());
   return shared_state;
 }