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

cc/test/surface_hittest_test_helpers.cc

 // Copyright 2015 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 "cc/test/surface_hittest_test_helpers.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
@@ skipping 50 matching lines @@
 
 void CreateRenderPass(const RenderPassId& render_pass_id,
                       const gfx::Rect& rect,
                       const gfx::Transform& transform_to_root_target,
                       RenderPassList* render_pass_list) {
   std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
   render_pass->SetNew(render_pass_id, rect, rect, transform_to_root_target);
   render_pass_list->push_back(std::move(render_pass));
 }
 
-std::unique_ptr<CompositorFrame> CreateCompositorFrameWithRenderPassList(
+CompositorFrame CreateCompositorFrameWithRenderPassList(
     RenderPassList* render_pass_list) {
   std::unique_ptr<DelegatedFrameData> root_delegated_frame_data(
       new DelegatedFrameData);
   root_delegated_frame_data->render_pass_list.swap(*render_pass_list);
-  std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
-  root_frame->delegated_frame_data = std::move(root_delegated_frame_data);
+  CompositorFrame root_frame;
+  root_frame.delegated_frame_data = std::move(root_delegated_frame_data);
   return root_frame;
 }
 
-std::unique_ptr<CompositorFrame> CreateCompositorFrame(
-    const gfx::Rect& root_rect,
-    RenderPass** render_pass) {
+CompositorFrame CreateCompositorFrame(const gfx::Rect& root_rect,
+                                      RenderPass** render_pass) {
   RenderPassList render_pass_list;
   RenderPassId root_id(1, 1);
   CreateRenderPass(root_id, root_rect, gfx::Transform(), &render_pass_list);
 
-  std::unique_ptr<CompositorFrame> root_frame =
+  CompositorFrame root_frame =
       CreateCompositorFrameWithRenderPassList(&render_pass_list);
 
-  *render_pass =
-      root_frame->delegated_frame_data->render_pass_list.back().get();
+  *render_pass = root_frame.delegated_frame_data->render_pass_list.back().get();
   return root_frame;
 }
 
 TestSurfaceHittestDelegate::TestSurfaceHittestDelegate()
     : reject_target_overrides_(0), accept_target_overrides_(0) {}
 
 TestSurfaceHittestDelegate::~TestSurfaceHittestDelegate() {}
 
 void TestSurfaceHittestDelegate::AddInsetsForRejectSurface(
     const SurfaceId& surface_id,
@@ skipping 33 matching lines @@
   // If the point provided falls outside the inset, then we accept this surface.
   if (!bounds.Contains(point_in_quad_space)) {
     ++accept_target_overrides_;
     return true;
   }
   return false;
 }
 
 }  // namespace test
 }  // namespace cc