[Ozone-GBM] Pumb DriWindowDelegate throughout the platform

ui/ozone/platform/dri/dri_surface_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 "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/ozone/platform/dri/crtc_state.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_surface.h"
+#include "ui/ozone/platform/dri/dri_window_delegate.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/test/mock_dri_wrapper.h"
 
 namespace {
 
 // Create a basic mode for a 6x4 screen.
 const drmModeModeInfo kDefaultMode =
     {0, 6, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, {'\0'}};
 
 const uint32_t kDefaultCrtc = 1;
 const uint32_t kDefaultConnector = 2;
 
+class MockDriWindowDelegate : public ui::DriWindowDelegate {
+ public:
+  MockDriWindowDelegate(ui::DriWrapper* drm) {
+    controller_.reset(new ui::HardwareDisplayController(
+        drm,
+        scoped_ptr<ui::CrtcState>(

[alexst (slow to review), 2014/08/20 21:51:09]

nit: I think using make_scoped_ptr() is a bit cleaner here.

[dnicoara, 2014/08/21 20:54:17]

Done.

+            new ui::CrtcState(drm, kDefaultCrtc, kDefaultConnector))));
+    scoped_refptr<ui::DriBuffer> buffer(new ui::DriBuffer(drm));
+    SkImageInfo info = SkImageInfo::MakeN32Premul(kDefaultMode.hdisplay,
+                                                  kDefaultMode.vdisplay);
+    EXPECT_TRUE(buffer->Initialize(info));
+    EXPECT_TRUE(controller_->Modeset(ui::OverlayPlane(buffer), kDefaultMode));
+  }
+  virtual ~MockDriWindowDelegate() {}
+
+  // DriWindowDelegate:
+  virtual void Initialize() OVERRIDE {}
+  virtual void Shutdown() OVERRIDE {}
+  virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE { return 1; }
+  virtual ui::HardwareDisplayController* GetController() OVERRIDE {
+    return controller_.get();
+  }
+  virtual void OnBoundsChanged(const gfx::Rect& bounds) OVERRIDE {}
+
+ private:
+  scoped_ptr<ui::HardwareDisplayController> controller_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockDriWindowDelegate);
+};
+
 }  // namespace
 
 class DriSurfaceTest : public testing::Test {
  public:
   DriSurfaceTest() {}
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
  protected:
   scoped_ptr<base::MessageLoop> message_loop_;
   scoped_ptr<ui::MockDriWrapper> drm_;
-  scoped_ptr<ui::HardwareDisplayController> controller_;
+  scoped_ptr<MockDriWindowDelegate> window_delegate_;
   scoped_ptr<ui::DriSurface> surface_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DriSurfaceTest);
 };
 
 void DriSurfaceTest::SetUp() {
   message_loop_.reset(new base::MessageLoopForUI);
   drm_.reset(new ui::MockDriWrapper(3));
-
-  controller_.reset(new ui::HardwareDisplayController(
-      drm_.get(),
-      scoped_ptr<ui::CrtcState>(
-          new ui::CrtcState(drm_.get(), kDefaultCrtc, kDefaultConnector))));
-  scoped_refptr<ui::DriBuffer> buffer(new ui::DriBuffer(drm_.get()));
-  SkImageInfo info = SkImageInfo::MakeN32Premul(kDefaultMode.hdisplay,
-                                                kDefaultMode.vdisplay);
-  EXPECT_TRUE(buffer->Initialize(info));
-  EXPECT_TRUE(controller_->Modeset(ui::OverlayPlane(buffer), kDefaultMode));
-
-  surface_.reset(new ui::DriSurface(drm_.get(), controller_->AsWeakPtr()));
+  window_delegate_.reset(new MockDriWindowDelegate(drm_.get()));
+  surface_.reset(new ui::DriSurface(window_delegate_.get(), drm_.get()));
   surface_->ResizeCanvas(gfx::Size(kDefaultMode.hdisplay,
                                    kDefaultMode.vdisplay));
 }
 
 void DriSurfaceTest::TearDown() {
   surface_.reset();
-  controller_.reset();
+  window_delegate_.reset();
   drm_.reset();
   message_loop_.reset();
 }
 
 TEST_F(DriSurfaceTest, CheckFBIDOnSwap) {
   surface_->PresentCanvas(gfx::Rect());
   // Framebuffer ID 1 is allocated in SetUp for the buffer used to modeset.
   EXPECT_EQ(3u, drm_->current_framebuffer());
   surface_->PresentCanvas(gfx::Rect());
   EXPECT_EQ(2u, drm_->current_framebuffer());
@@ skipping 22 matching lines @@
   // Make sure the updates are correctly propagated to the native surface.
   for (int i = 0; i < image.height(); ++i) {
     for (int j = 0; j < image.width(); ++j) {
       if (j < kDefaultMode.hdisplay / 2 && i < kDefaultMode.vdisplay / 2)
         EXPECT_EQ(SK_ColorWHITE, image.getColor(j, i));
       else
         EXPECT_EQ(SK_ColorBLACK, image.getColor(j, i));
     }
   }
 }