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

android_webview/browser/hardware_renderer.cc

Index: android_webview/browser/hardware_renderer.cc
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
index acac292f4be6b8311fa1c56334dccd5710442810..33a8908f7619df0e11b26b03d5dfa7a61b415fae 100644
--- a/android_webview/browser/hardware_renderer.cc
+++ b/android_webview/browser/hardware_renderer.cc
@@ -171,7 +171,7 @@ void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info,
     }
 
     surface_factory_->SubmitCompositorFrame(child_id_,
-                                            std::move(child_compositor_frame),
+                                            std::move(*child_compositor_frame),
                                             cc::SurfaceFactory::DrawCallback());
   }
 
@@ -218,8 +218,8 @@ void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info,
   std::unique_ptr<cc::DelegatedFrameData> delegated_frame(
       new cc::DelegatedFrameData);
   delegated_frame->render_pass_list.push_back(std::move(render_pass));
-  std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
-  frame->delegated_frame_data = std::move(delegated_frame);
+  cc::CompositorFrame frame;
+  frame.delegated_frame_data = std::move(delegated_frame);
 
   if (root_id_.is_null()) {
     root_id_ = surface_id_allocator_->GenerateId();