Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / output / output_surface_unittest.cc

diff --git a/src/cc/output/output_surface_unittest.cc b/src/cc/output/output_surface_unittest.cc
index 299baba..b1f4149 100644 (file)
--- a/src/cc/output/output_surface_unittest.cc
+++ b/src/cc/output/output_surface_unittest.cc
@@ -32,6 +32,11 @@ class TestOutputSurface : public OutputSurface {
                     scoped_ptr<SoftwareOutputDevice> software_device)
       : OutputSurface(context_provider, software_device.Pass()) {}
 
+  void SwapBuffers(CompositorFrame* frame) override {
+    client_->DidSwapBuffers();
+    client_->DidSwapBuffersComplete();
+  }
+
   bool InitializeNewContext3d(
       scoped_refptr<ContextProvider> new_context_provider) {
     return InitializeAndSetContext3d(new_context_provider);
@@ -58,11 +63,11 @@ class TestOutputSurface : public OutputSurface {
 class TestSoftwareOutputDevice : public SoftwareOutputDevice {
  public:
   TestSoftwareOutputDevice();
-  virtual ~TestSoftwareOutputDevice();
+  ~TestSoftwareOutputDevice() override;
 
   // Overriden from cc:SoftwareOutputDevice
-  virtual void DiscardBackbuffer() OVERRIDE;
-  virtual void EnsureBackbuffer() OVERRIDE;
+  void DiscardBackbuffer() override;
+  void EnsureBackbuffer() override;
 
   int discard_backbuffer_count() { return discard_backbuffer_count_; }
   int ensure_backbuffer_count() { return ensure_backbuffer_count_; }
@@ -209,8 +214,7 @@ TEST(OutputSurfaceTest, SoftwareOutputDeviceBackbufferManagement) {
 
   // TestOutputSurface now owns software_output_device and has responsibility to
   // free it.
-  scoped_ptr<TestSoftwareOutputDevice> p(software_output_device);
-  TestOutputSurface output_surface(p.PassAs<SoftwareOutputDevice>());
+  TestOutputSurface output_surface(make_scoped_ptr(software_output_device));
 
   EXPECT_EQ(0, software_output_device->ensure_backbuffer_count());
   EXPECT_EQ(0, software_output_device->discard_backbuffer_count());