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

android_webview/browser/test/rendering_test.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/test/rendering_test.h"
 
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
@@ skipping 94 matching lines @@
 
 void RenderingTest::QuitMessageLoop() {
   DCHECK_EQ(base::MessageLoop::current(), message_loop_.get());
   message_loop_->QuitWhenIdle();
 }
 
 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;
 }
 
 FakeFunctor* RenderingTest::GetFunctor() {
   return functor_.get();
 }
 
 void RenderingTest::WillOnDraw() {
   DCHECK(compositor_);
   compositor_->SetHardwareFrame(0u, ConstructEmptyFrame());
@@ skipping 13 matching lines @@
 void RenderingTest::PostInvalidate() {
   if (window_)
     window_->PostInvalidate();
 }
 
 gfx::Point RenderingTest::GetLocationOnScreen() {
   return gfx::Point();
 }
 
 }  // namespace android_webview