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

cc/surfaces/surface_aggregator.h

 // 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.
 
 #ifndef CC_SURFACES_SURFACE_AGGREGATOR_H_
 #define CC_SURFACES_SURFACE_AGGREGATOR_H_
 
 #include <memory>
 #include <set>
 #include <unordered_map>
@@ skipping 18 matching lines @@
 
 class CC_SURFACES_EXPORT SurfaceAggregator {
  public:
   using SurfaceIndexMap = std::unordered_map<SurfaceId, int, SurfaceIdHash>;
 
   SurfaceAggregator(SurfaceManager* manager,
                     ResourceProvider* provider,
                     bool aggregate_only_damaged);
   ~SurfaceAggregator();
 
-  CompositorFrame Aggregate(SurfaceId surface_id);
+  std::unique_ptr<CompositorFrame> Aggregate(SurfaceId surface_id);
   void ReleaseResources(SurfaceId surface_id);
   SurfaceIndexMap& previous_contained_surfaces() {
     return previous_contained_surfaces_;
   }
   void SetFullDamageForSurface(SurfaceId surface_id);
   void set_output_is_secure(bool secure) { output_is_secure_ = secure; }
 
  private:
   struct ClipData {
     ClipData() : is_clipped(false) {}
@@ skipping 118 matching lines @@
   TransferableResourceArray* dest_resource_list_;
 
   base::WeakPtrFactory<SurfaceAggregator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceAggregator);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_AGGREGATOR_H_