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

cc/output/gl_renderer_unittest.cc

Index: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index be83075db3ae7f43a3bcf523ff9ebd8628c98d88..23e84fcc6ca8fb7e91be70e50c85f4c5f4c55fb1 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -1780,7 +1780,10 @@ class MockOutputSurface : public OutputSurface {
                void(const gfx::Size& size, float scale_factor, bool has_alpha));
   MOCK_METHOD0(BindFramebuffer, void());
   MOCK_METHOD0(GetFramebufferCopyTextureFormat, GLenum());
-  MOCK_METHOD1(SwapBuffers, void(CompositorFrame* frame));
+  MOCK_METHOD1(SwapBuffers_, void(std::unique_ptr<CompositorFrame>& frame));
+  void SwapBuffers(std::unique_ptr<CompositorFrame> frame) override {
+    SwapBuffers_(frame);
+  }
 };
 
 class MockOutputSurfaceTest : public GLRendererTest {
@@ -1849,7 +1852,7 @@ TEST_F(MockOutputSurfaceTest, DrawFrameAndSwap) {
   gfx::Rect device_viewport_rect(1, 1);
   DrawFrame(1.f, device_viewport_rect, true);
 
-  EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1);
+  EXPECT_CALL(output_surface_, SwapBuffers_(_)).Times(1);
   renderer_->SwapBuffers(CompositorFrameMetadata());
 }
 
@@ -1857,7 +1860,7 @@ TEST_F(MockOutputSurfaceTest, DrawOpaqueFrameAndSwap) {
   gfx::Rect device_viewport_rect(1, 1);
   DrawFrame(1.f, device_viewport_rect, false);
 
-  EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1);
+  EXPECT_CALL(output_surface_, SwapBuffers_(_)).Times(1);
   renderer_->SwapBuffers(CompositorFrameMetadata());
 }
 
@@ -1865,23 +1868,23 @@ TEST_F(MockOutputSurfaceTest, DrawFrameAndResizeAndSwap) {
   gfx::Rect device_viewport_rect(1, 1);
 
   DrawFrame(1.f, device_viewport_rect, true);
-  EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1);
+  EXPECT_CALL(output_surface_, SwapBuffers_(_)).Times(1);
   renderer_->SwapBuffers(CompositorFrameMetadata());
 
   device_viewport_rect = gfx::Rect(2, 2);
 
   DrawFrame(2.f, device_viewport_rect, true);
-  EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1);
+  EXPECT_CALL(output_surface_, SwapBuffers_(_)).Times(1);
   renderer_->SwapBuffers(CompositorFrameMetadata());
 
   DrawFrame(2.f, device_viewport_rect, true);
-  EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1);
+  EXPECT_CALL(output_surface_, SwapBuffers_(_)).Times(1);
   renderer_->SwapBuffers(CompositorFrameMetadata());
 
   device_viewport_rect = gfx::Rect(1, 1);
 
   DrawFrame(1.f, device_viewport_rect, true);
-  EXPECT_CALL(output_surface_, SwapBuffers(_)).Times(1);
+  EXPECT_CALL(output_surface_, SwapBuffers_(_)).Times(1);
   renderer_->SwapBuffers(CompositorFrameMetadata());
 }