Make cc::CompositorFrames movable [Part 1 of 2]

android_webview/browser/browser_view_renderer.cc

Index: android_webview/browser/browser_view_renderer.cc
diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc
index ef2418d081cba509ca391bc3380b237d279025db..7e22619510673a046707a4d5fcde0fd0c3a61f22 100644
--- a/android_webview/browser/browser_view_renderer.cc
+++ b/android_webview/browser/browser_view_renderer.cc
@@ -247,14 +247,14 @@ bool BrowserViewRenderer::OnDrawHardware() {
                                 clip,
                                 viewport_rect_for_tile_priority,
                                 transform_for_tile_priority);
-  if (!frame.frame.get()) {
+  if (!frame.frame) {
     TRACE_EVENT_INSTANT0("android_webview", "NoNewFrame",
                          TRACE_EVENT_SCOPE_THREAD);
     return current_compositor_frame_consumer_->HasFrameOnUI();
   }
 
   std::unique_ptr<ChildFrame> child_frame = base::WrapUnique(new ChildFrame(
-      frame.output_surface_id, std::move(frame.frame), compositor_id_,
+      frame.output_surface_id, std::move(*frame.frame), compositor_id_,
       viewport_rect_for_tile_priority.IsEmpty(), transform_for_tile_priority,
       offscreen_pre_raster_, external_draw_constraints_.is_layer));
 
@@ -293,7 +293,7 @@ void BrowserViewRenderer::RemoveCompositorFrameConsumer(
 
 void BrowserViewRenderer::ReturnUnusedResource(
     std::unique_ptr<ChildFrame> child_frame) {
-  if (!child_frame.get() || !child_frame->frame.get())
+  if (!child_frame.get() || !child_frame->frame)
     return;
 
   cc::CompositorFrameAck frame_ack;