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

android_webview/browser/test/rendering_test.cc

Index: android_webview/browser/test/rendering_test.cc
diff --git a/android_webview/browser/test/rendering_test.cc b/android_webview/browser/test/rendering_test.cc
index 107658c8c75cbd9e394586ed8779c6f28e5aff25..774e61327330e0ce53f4d17dc328a36db7e424a6 100644
--- a/android_webview/browser/test/rendering_test.cc
+++ b/android_webview/browser/test/rendering_test.cc
@@ -112,25 +112,23 @@ content::SynchronousCompositor* RenderingTest::ActiveCompositor() const {
   return browser_view_renderer_->GetActiveCompositorForTesting();
 }
 
-std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructEmptyFrame() {
-  std::unique_ptr<cc::CompositorFrame> compositor_frame(
-      new cc::CompositorFrame);
+cc::CompositorFrame RenderingTest::ConstructEmptyFrame() {
+  cc::CompositorFrame compositor_frame;
   std::unique_ptr<cc::DelegatedFrameData> frame(new cc::DelegatedFrameData);
   std::unique_ptr<cc::RenderPass> root_pass(cc::RenderPass::Create());
   gfx::Rect viewport(browser_view_renderer_->size());
   root_pass->SetNew(cc::RenderPassId(1, 1), viewport, viewport,
                     gfx::Transform());
   frame->render_pass_list.push_back(std::move(root_pass));
-  compositor_frame->delegated_frame_data = std::move(frame);
+  compositor_frame.delegated_frame_data = std::move(frame);
   return compositor_frame;
 }
 
-std::unique_ptr<cc::CompositorFrame> RenderingTest::ConstructFrame(
-    cc::ResourceId resource_id) {
-  std::unique_ptr<cc::CompositorFrame> compositor_frame(ConstructEmptyFrame());
+cc::CompositorFrame RenderingTest::ConstructFrame(cc::ResourceId resource_id) {
+  cc::CompositorFrame compositor_frame(ConstructEmptyFrame());
   cc::TransferableResource resource;
   resource.id = resource_id;
-  compositor_frame->delegated_frame_data->resource_list.push_back(resource);
+  compositor_frame.delegated_frame_data->resource_list.push_back(resource);
   return compositor_frame;
 }