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

android_webview/browser/test/rendering_test.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 ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_
 #define ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_
 
 #include <memory>
 
 #include "android_webview/browser/browser_view_renderer_client.h"
@@ skipping 64 matching lines @@
   CompositorFrameConsumer* GetCompositorFrameConsumer();
   CompositorFrameProducer* GetCompositorFrameProducer();
 
   virtual void SetUpTestHarness();
   virtual void StartTest();
 
   void RunTest();
   void InitializeCompositor();
   void EndTest();
   content::SynchronousCompositor* ActiveCompositor() const;
-  std::unique_ptr<cc::CompositorFrame> ConstructEmptyFrame();
-  std::unique_ptr<cc::CompositorFrame> ConstructFrame(
-      cc::ResourceId resource_id);
+  cc::CompositorFrame ConstructEmptyFrame();
+  cc::CompositorFrame ConstructFrame(cc::ResourceId resource_id);
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
   std::unique_ptr<FakeWindow> window_;
   std::unique_ptr<FakeFunctor> functor_;
   std::unique_ptr<BrowserViewRenderer> browser_view_renderer_;
   std::unique_ptr<content::TestSynchronousCompositor> compositor_;
 
  private:
   void QuitMessageLoop();
 
   void DrawGL(AwDrawGLInfo* aw_draw_gl_info);
 
   const std::unique_ptr<base::MessageLoop> message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderingTest);
 };
 
 #define RENDERING_TEST_F(TEST_FIXTURE_NAME)         \
   TEST_F(TEST_FIXTURE_NAME, RunTest) { RunTest(); } \
   class NeedsSemicolon##TEST_FIXTURE_NAME {}
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_