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

cc/surfaces/surface_factory.cc

 // 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.
 
 #include "cc/surfaces/surface_factory.h"
 
 #include <utility>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 56 matching lines @@
 }
 
 void SurfaceFactory::SetSurfaceGpuMemoryBufferClientId(
     SurfaceId surface_id,
     int gpu_memory_buffer_client_id) {
   OwningSurfaceMap::iterator it = surface_map_.find(surface_id);
   DCHECK(it != surface_map_.end());
   it->second->SetGpuMemoryBufferClientId(gpu_memory_buffer_client_id);
 }
 
-void SurfaceFactory::SubmitCompositorFrame(SurfaceId surface_id,
-                                           CompositorFrame frame,
-                                           const DrawCallback& callback) {
+void SurfaceFactory::SubmitCompositorFrame(
+    SurfaceId surface_id,
+    std::unique_ptr<CompositorFrame> frame,
+    const DrawCallback& callback) {
   TRACE_EVENT0("cc", "SurfaceFactory::SubmitCompositorFrame");
   OwningSurfaceMap::iterator it = surface_map_.find(surface_id);
   DCHECK(it != surface_map_.end());
   DCHECK(it->second->factory().get() == this);
   it->second->QueueFrame(std::move(frame), callback);
   if (!manager_->SurfaceModified(surface_id)) {
     TRACE_EVENT_INSTANT0("cc", "Damage not visible.", TRACE_EVENT_SCOPE_THREAD);
     it->second->RunDrawCallbacks(SurfaceDrawStatus::DRAW_SKIPPED);
   }
 }
@@ skipping 23 matching lines @@
 
 void SurfaceFactory::RefResources(const TransferableResourceArray& resources) {
   holder_.RefResources(resources);
 }
 
 void SurfaceFactory::UnrefResources(const ReturnedResourceArray& resources) {
   holder_.UnrefResources(resources);
 }
 
 }  // namespace cc