[Ozone] Adding a software rendering implementation of SurfaceFactoryOzone

ui/gfx/ozone/impl/hardware_display_controller_ozone_unittest.cc

 // Copyright 2013 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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/ozone/impl/drm_skbitmap_ozone.h"
 #include "ui/gfx/ozone/impl/drm_wrapper_ozone.h"
 #include "ui/gfx/ozone/impl/hardware_display_controller_ozone.h"
 #include "ui/gfx/ozone/impl/software_surface_ozone.h"
 
@@ skipping 181 matching lines @@
       drm_.get(), kConnectorId, kCrtcId, kDefaultMode);
 
   EXPECT_EQ(1, drm_->get_get_crtc_call_count());
   EXPECT_EQ(gfx::HardwareDisplayControllerOzone::UNINITIALIZED,
             controller_->get_state());
 }
 
 TEST_F(HardwareDisplayControllerOzoneTest, CheckStateAfterSurfaceIsBound) {
   controller_->SetControllerInfo(
       drm_.get(), kConnectorId, kCrtcId, kDefaultMode);
-  gfx::SoftwareSurfaceOzone* surface =
-      new MockSoftwareSurfaceOzone(controller_.get());
+  scoped_ptr<gfx::SoftwareSurfaceOzone> surface(
+      new MockSoftwareSurfaceOzone(controller_.get()));
 
   EXPECT_TRUE(surface->Initialize());
-  EXPECT_TRUE(controller_->BindSurfaceToController(surface));
+  EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass()));
 
   EXPECT_EQ(2, drm_->get_add_framebuffer_call_count());
   EXPECT_EQ(gfx::HardwareDisplayControllerOzone::SURFACE_INITIALIZED,
             controller_->get_state());
 }
 
 TEST_F(HardwareDisplayControllerOzoneTest, CheckStateIfBindingFails) {
   drm_->set_add_framebuffer_expectation(false);
 
   controller_->SetControllerInfo(
       drm_.get(), kConnectorId, kCrtcId, kDefaultMode);
-  gfx::SoftwareSurfaceOzone* surface =
-      new MockSoftwareSurfaceOzone(controller_.get());
+  scoped_ptr<gfx::SoftwareSurfaceOzone> surface(
+      new MockSoftwareSurfaceOzone(controller_.get()));
 
   EXPECT_TRUE(surface->Initialize());
-  EXPECT_FALSE(controller_->BindSurfaceToController(surface));
+  EXPECT_FALSE(controller_->BindSurfaceToController(surface.Pass()));
 
   EXPECT_EQ(1, drm_->get_add_framebuffer_call_count());
   EXPECT_EQ(gfx::HardwareDisplayControllerOzone::FAILED,
             controller_->get_state());
-
-  // Normally the controller would take ownership, but we failed to bind, so we
-  // need to clean up.
-  delete surface;
 }
 
 TEST_F(HardwareDisplayControllerOzoneTest, CheckStateAfterPageFlip) {
   controller_->SetControllerInfo(
       drm_.get(), kConnectorId, kCrtcId, kDefaultMode);
-  gfx::SoftwareSurfaceOzone* surface =
-      new MockSoftwareSurfaceOzone(controller_.get());
+  scoped_ptr<gfx::SoftwareSurfaceOzone> surface(
+      new MockSoftwareSurfaceOzone(controller_.get()));
 
   EXPECT_TRUE(surface->Initialize());
-  EXPECT_TRUE(controller_->BindSurfaceToController(surface));
+  EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass()));
 
   controller_->SchedulePageFlip();
 
   EXPECT_EQ(gfx::HardwareDisplayControllerOzone::INITIALIZED,
             controller_->get_state());
 }
 
 TEST_F(HardwareDisplayControllerOzoneTest, CheckStateIfModesetFails) {
   drm_->set_set_crtc_expectation(false);
 
   controller_->SetControllerInfo(
       drm_.get(), kConnectorId, kCrtcId, kDefaultMode);
-  gfx::SoftwareSurfaceOzone* surface =
-      new MockSoftwareSurfaceOzone(controller_.get());
+  scoped_ptr<gfx::SoftwareSurfaceOzone> surface(
+      new MockSoftwareSurfaceOzone(controller_.get()));
 
   EXPECT_TRUE(surface->Initialize());
-  EXPECT_TRUE(controller_->BindSurfaceToController(surface));
+  EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass()));
 
   controller_->SchedulePageFlip();
 
   EXPECT_EQ(gfx::HardwareDisplayControllerOzone::FAILED,
             controller_->get_state());
 }
 
 TEST_F(HardwareDisplayControllerOzoneTest, CheckStateIfPageFlipFails) {
   drm_->set_page_flip_expectation(false);
 
   controller_->SetControllerInfo(
       drm_.get(), kConnectorId, kCrtcId, kDefaultMode);
-  gfx::SoftwareSurfaceOzone* surface =
-      new MockSoftwareSurfaceOzone(controller_.get());
+  scoped_ptr<gfx::SoftwareSurfaceOzone> surface(
+      new MockSoftwareSurfaceOzone(controller_.get()));
 
   EXPECT_TRUE(surface->Initialize());
-  EXPECT_TRUE(controller_->BindSurfaceToController(surface));
+  EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass()));
 
   controller_->SchedulePageFlip();
 
   EXPECT_EQ(gfx::HardwareDisplayControllerOzone::FAILED,
             controller_->get_state());
 }
 
 TEST_F(HardwareDisplayControllerOzoneTest, CheckProperDestruction) {
   controller_->SetControllerInfo(
       drm_.get(), kConnectorId, kCrtcId, kDefaultMode);
-  gfx::SoftwareSurfaceOzone* surface =
-      new MockSoftwareSurfaceOzone(controller_.get());
+  scoped_ptr<gfx::SoftwareSurfaceOzone> surface(
+      new MockSoftwareSurfaceOzone(controller_.get()));
 
   EXPECT_TRUE(surface->Initialize());
-  EXPECT_TRUE(controller_->BindSurfaceToController(surface));
+  EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass()));
 
   EXPECT_EQ(gfx::HardwareDisplayControllerOzone::SURFACE_INITIALIZED,
             controller_->get_state());
 
   controller_.reset();
 
   EXPECT_EQ(2, drm_->get_remove_framebuffer_call_count());
   EXPECT_EQ(1, drm_->get_restore_crtc_call_count());
   EXPECT_EQ(1, drm_->get_free_crtc_call_count());
 }