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

cc/surfaces/surface_aggregator_perftest.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 "base/memory/ptr_util.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
@@ skipping 72 matching lines @@
       sqs = pass->CreateAndAppendSharedQuadState();
       sqs->opacity = opacity;
       if (i > 1) {
         SurfaceDrawQuad* surface_quad =
             pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
         surface_quad->SetNew(sqs, gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1),
                              SurfaceId(0, i - 1, 0));
       }
 
       frame_data->render_pass_list.push_back(std::move(pass));
-      CompositorFrame frame;
-      frame.delegated_frame_data = std::move(frame_data);
+      std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
+      frame->delegated_frame_data = std::move(frame_data);
       factory_.SubmitCompositorFrame(SurfaceId(0, i, 0), std::move(frame),
                                      SurfaceFactory::DrawCallback());
     }
 
     factory_.Create(SurfaceId(0, num_surfaces + 1, 0));
     timer_.Reset();
     do {
       std::unique_ptr<RenderPass> pass(RenderPass::Create());
       std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
 
       SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
       SurfaceDrawQuad* surface_quad =
           pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
       surface_quad->SetNew(sqs, gfx::Rect(0, 0, 100, 100),
                            gfx::Rect(0, 0, 100, 100),
                            SurfaceId(0, num_surfaces, 0));
 
       if (full_damage)
         pass->damage_rect = gfx::Rect(0, 0, 100, 100);
       else
         pass->damage_rect = gfx::Rect(0, 0, 1, 1);
 
       frame_data->render_pass_list.push_back(std::move(pass));
-      CompositorFrame frame;
-      frame.delegated_frame_data = std::move(frame_data);
+      std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
+      frame->delegated_frame_data = std::move(frame_data);
       factory_.SubmitCompositorFrame(SurfaceId(0, num_surfaces + 1, 0),
                                      std::move(frame),
                                      SurfaceFactory::DrawCallback());
 
-      CompositorFrame aggregated =
+      std::unique_ptr<CompositorFrame> aggregated =
           aggregator_->Aggregate(SurfaceId(0, num_surfaces + 1, 0));
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult("aggregator_speed", "", name, timer_.LapsPerSecond(),
                            "runs/s", true);
 
     factory_.Destroy(SurfaceId(0, num_surfaces + 1, 0));
     for (int i = 1; i <= num_surfaces; i++)
       factory_.Destroy(SurfaceId(0, i, 0));
@@ skipping 34 matching lines @@
 TEST_F(SurfaceAggregatorPerfTest, FewSurfacesDamageCalc) {
   RunTest(3, 1000, 1.f, true, true, "few_surfaces_damage_calc");
 }
 
 TEST_F(SurfaceAggregatorPerfTest, FewSurfacesAggregateDamaged) {
   RunTest(3, 1000, 1.f, true, false, "few_surfaces_aggregate_damaged");
 }
 
 }  // namespace
 }  // namespace cc