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

content/public/test/test_synchronous_compositor_android.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 "content/public/test/test_synchronous_compositor_android.h"
 
 #include <utility>
 
 #include "cc/output/compositor_frame.h"
 
@@ skipping 37 matching lines @@
 void TestSynchronousCompositor::SwapReturnedResources(FrameAckArray* array) {
   DCHECK(array);
   frame_ack_array_.swap(*array);
 }
 
 bool TestSynchronousCompositor::DemandDrawSw(SkCanvas* canvas) {
   DCHECK(canvas);
   return true;
 }
 
-void TestSynchronousCompositor::SetHardwareFrame(
-    uint32_t output_surface_id,
-    std::unique_ptr<cc::CompositorFrame> frame) {
+void TestSynchronousCompositor::SetHardwareFrame(uint32_t output_surface_id,
+                                                 cc::CompositorFrame frame) {
   hardware_frame_.output_surface_id = output_surface_id;
-  hardware_frame_.frame = std::move(frame);
+  std::unique_ptr<cc::CompositorFrame> frame_copy(new cc::CompositorFrame);
+  *frame_copy = std::move(frame);
+  hardware_frame_.frame = std::move(frame_copy);
 }
 
 TestSynchronousCompositor::ReturnedResources::ReturnedResources()
     : output_surface_id(0u) {}
 
 TestSynchronousCompositor::ReturnedResources::ReturnedResources(
     const ReturnedResources& other) = default;
 
 TestSynchronousCompositor::ReturnedResources::~ReturnedResources() {}
 
 }  // namespace content