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

cc/surfaces/surface_factory.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_FACTORY_H_
 #define CC_SURFACES_SURFACE_FACTORY_H_
 
 #include <memory>
 #include <set>
 #include <unordered_map>
@@ skipping 44 matching lines @@
 
   // Set the GpuMemoryBuffer client id for resources coming from a surface.
   void SetSurfaceGpuMemoryBufferClientId(SurfaceId surface_id,
                                          int gpu_memory_buffer_client_id);
 
   // A frame can only be submitted to a surface created by this factory,
   // although the frame may reference surfaces created by other factories.
   // The callback is called the first time this frame is used to draw, or if
   // the frame is discarded.
   void SubmitCompositorFrame(SurfaceId surface_id,
-                             CompositorFrame frame,
+                             std::unique_ptr<CompositorFrame> frame,
                              const DrawCallback& callback);
   void RequestCopyOfSurface(SurfaceId surface_id,
                             std::unique_ptr<CopyOutputRequest> copy_request);
 
   void WillDrawSurface(SurfaceId id, const gfx::Rect& damage_rect);
 
   SurfaceFactoryClient* client() { return client_; }
 
   void ReceiveFromChild(const TransferableResourceArray& resources);
   void RefResources(const TransferableResourceArray& resources);
@@ skipping 21 matching lines @@
   using OwningSurfaceMap =
       std::unordered_map<SurfaceId, std::unique_ptr<Surface>, SurfaceIdHash>;
   OwningSurfaceMap surface_map_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceFactory);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_FACTORY_H_