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

cc/surfaces/surface_aggregator_perftest.cc

Index: cc/surfaces/surface_aggregator_perftest.cc
diff --git a/cc/surfaces/surface_aggregator_perftest.cc b/cc/surfaces/surface_aggregator_perftest.cc
index d9037435f2bc3cf4e7f6b26d5eeb7a2b87fb9b7e..9c24baed33d2c83cf3046724aea1a27c4449b047 100644
--- a/cc/surfaces/surface_aggregator_perftest.cc
+++ b/cc/surfaces/surface_aggregator_perftest.cc
@@ -90,8 +90,8 @@
       }
 
       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());
     }
@@ -115,13 +115,13 @@
         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());