[Ozone-DRI] Move framebuffer initialization into the buffer

ui/ozone/platform/dri/hardware_display_controller_unittest.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 "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_surface.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
@@ skipping 47 matching lines @@
                        uint32_t* connectors,
                        drmModeModeInfo* mode) OVERRIDE {
     return set_crtc_expectation_;
   }
 
   virtual bool SetCrtc(drmModeCrtc* crtc, uint32_t* connectors) OVERRIDE {
     restore_crtc_call_count_++;
     return true;
   }
 
-  virtual bool AddFramebuffer(const drmModeModeInfo& mode,
+  virtual bool AddFramebuffer(uint32_t width,
+                              uint32_t height,
                               uint8_t depth,
                               uint8_t bpp,
                               uint32_t stride,
                               uint32_t handle,
                               uint32_t* framebuffer) OVERRIDE {
     add_framebuffer_call_count_++;
     return add_framebuffer_expectation_;
   }
 
   virtual bool RemoveFramebuffer(uint32_t framebuffer) OVERRIDE {
@@ skipping 140 matching lines @@
 }
 
 TEST_F(HardwareDisplayControllerTest, CheckStateAfterSurfaceIsBound) {
   scoped_ptr<ui::DriSurface> surface(
       new MockDriSurface(drm_.get(), kDefaultModeSize));
 
   EXPECT_TRUE(surface->Initialize());
   EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(),
                                                    kDefaultMode));
 
-  EXPECT_EQ(2, drm_->get_add_framebuffer_call_count());
   EXPECT_TRUE(controller_->get_surface() != NULL);
 }
 
-TEST_F(HardwareDisplayControllerTest, CheckStateIfBindingFails) {
-  drm_->set_add_framebuffer_expectation(false);
-
-  scoped_ptr<ui::DriSurface> surface(
-      new MockDriSurface(drm_.get(), kDefaultModeSize));
-
-  EXPECT_TRUE(surface->Initialize());
-  EXPECT_FALSE(controller_->BindSurfaceToController(surface.Pass(),
-                                                    kDefaultMode));
-
-  EXPECT_EQ(1, drm_->get_add_framebuffer_call_count());
-  EXPECT_EQ(NULL, controller_->get_surface());
-}
-
 TEST_F(HardwareDisplayControllerTest, CheckStateAfterPageFlip) {
   scoped_ptr<ui::DriSurface> surface(
       new MockDriSurface(drm_.get(), kDefaultModeSize));
 
   EXPECT_TRUE(surface->Initialize());
   EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(),
                                                    kDefaultMode));
 
   EXPECT_TRUE(controller_->SchedulePageFlip());
   EXPECT_TRUE(controller_->get_surface() != NULL);
@@ skipping 15 matching lines @@
   drm_->set_page_flip_expectation(false);
 
   scoped_ptr<ui::DriSurface> surface(
       new MockDriSurface(drm_.get(), kDefaultModeSize));
 
   EXPECT_TRUE(surface->Initialize());
   EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(),
                                                    kDefaultMode));
   EXPECT_FALSE(controller_->SchedulePageFlip());
 }
-
-TEST_F(HardwareDisplayControllerTest, CheckProperDestruction) {
-  scoped_ptr<ui::DriSurface> surface(
-      new MockDriSurface(drm_.get(), kDefaultModeSize));
-
-  EXPECT_TRUE(surface->Initialize());
-  EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(),
-                                                   kDefaultMode));
-  EXPECT_TRUE(controller_->get_surface() != NULL);
-
-  controller_.reset();
-
-  EXPECT_EQ(2, drm_->get_remove_framebuffer_call_count());
-}