[Ozone] Fix SoftwareOutputDevice tests

content/browser/compositor/software_output_device_ozone_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/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/software_frame_data.h"
 #include "content/browser/compositor/software_output_device_ozone.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_implementation.h"
-#include "ui/ozone/public/surface_factory_ozone.h"
+#include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
+#include "ui/platform_window/platform_window.h"
+#include "ui/platform_window/platform_window_delegate.h"
 
 namespace {
 
-class MockSurfaceOzone : public ui::SurfaceOzoneCanvas {
+class TestPlatformWindowDelegate : public ui::PlatformWindowDelegate {
  public:
-  MockSurfaceOzone() {}
-  virtual ~MockSurfaceOzone() {}
+  TestPlatformWindowDelegate() : widget_(gfx::kNullAcceleratedWidget) {}
+  ~TestPlatformWindowDelegate() override {}
 
-  // ui::SurfaceOzoneCanvas overrides:
-  virtual void ResizeCanvas(const gfx::Size& size) override {
-    surface_ = skia::AdoptRef(SkSurface::NewRaster(
-        SkImageInfo::MakeN32Premul(size.width(), size.height())));
+  gfx::AcceleratedWidget GetAcceleratedWidget() const { return widget_; }
+
+  // ui::PlatformWindowDelegate:
+  void OnBoundsChanged(const gfx::Rect& new_bounds) override {}
+  void OnDamageRect(const gfx::Rect& damaged_region) override {}
+  void DispatchEvent(ui::Event* event) override {}
+  void OnCloseRequest() override {}
+  void OnClosed() override {}
+  void OnWindowStateChanged(ui::PlatformWindowState new_state) override {}
+  void OnLostCapture() override {}
+  void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override {
+    widget_ = widget;
   }
-  virtual skia::RefPtr<SkCanvas> GetCanvas() override {
-    return skia::SharePtr(surface_->getCanvas());
-  }
-  virtual void PresentCanvas(const gfx::Rect& damage) override {}
-  virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override {
-    return scoped_ptr<gfx::VSyncProvider>();
-  }
+  void OnActivationChanged(bool active) override {}
 
  private:
-  skia::RefPtr<SkSurface> surface_;
+  gfx::AcceleratedWidget widget_;
 
-  DISALLOW_COPY_AND_ASSIGN(MockSurfaceOzone);
-};
-
-class MockSurfaceFactoryOzone : public ui::SurfaceFactoryOzone {
- public:
-  MockSurfaceFactoryOzone() {}
-  virtual ~MockSurfaceFactoryOzone() {}
-
-  virtual bool LoadEGLGLES2Bindings(
-      AddGLLibraryCallback add_gl_library,
-      SetGLGetProcAddressProcCallback set_gl_get_proc_address) override {
-    return false;
-  }
-  virtual scoped_ptr<ui::SurfaceOzoneCanvas> CreateCanvasForWidget(
-      gfx::AcceleratedWidget widget) override {
-    return make_scoped_ptr<ui::SurfaceOzoneCanvas>(new MockSurfaceOzone());
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MockSurfaceFactoryOzone);
+  DISALLOW_COPY_AND_ASSIGN(TestPlatformWindowDelegate);
 };
 
 }  // namespace
 
 class SoftwareOutputDeviceOzoneTest : public testing::Test {
  public:
   SoftwareOutputDeviceOzoneTest();
   virtual ~SoftwareOutputDeviceOzoneTest();
 
   virtual void SetUp() override;
   virtual void TearDown() override;
 
  protected:
   scoped_ptr<content::SoftwareOutputDeviceOzone> output_device_;
   bool enable_pixel_output_;
 
  private:
   scoped_ptr<ui::Compositor> compositor_;
   scoped_ptr<base::MessageLoop> message_loop_;
-  scoped_ptr<ui::SurfaceFactoryOzone> surface_factory_;
+  TestPlatformWindowDelegate window_delegate_;
+  scoped_ptr<ui::PlatformWindow> window_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzoneTest);
 };
 
 SoftwareOutputDeviceOzoneTest::SoftwareOutputDeviceOzoneTest()
     : enable_pixel_output_(false) {
   message_loop_.reset(new base::MessageLoopForUI);
 }
 
 SoftwareOutputDeviceOzoneTest::~SoftwareOutputDeviceOzoneTest() {
 }
 
 void SoftwareOutputDeviceOzoneTest::SetUp() {
   ui::ContextFactory* context_factory =
       ui::InitializeContextFactoryForTests(enable_pixel_output_);
 
-  surface_factory_.reset(new MockSurfaceFactoryOzone());
-
   const gfx::Size size(500, 400);
-  const gfx::AcceleratedWidget kTestAcceleratedWidget = 1;
-  compositor_.reset(
-      new ui::Compositor(kTestAcceleratedWidget,
-                         context_factory,
-                         base::MessageLoopProxy::current()));
+  window_ = ui::OzonePlatform::GetInstance()->CreatePlatformWindow(
+      &window_delegate_, gfx::Rect(size));
+  compositor_.reset(new ui::Compositor(window_delegate_.GetAcceleratedWidget(),
+                                       context_factory,
+                                       base::MessageLoopProxy::current()));
   compositor_->SetScaleAndSize(1.0f, size);
 
   output_device_.reset(new content::SoftwareOutputDeviceOzone(
       compositor_.get()));
   output_device_->Resize(size, 1.f);
 }
 
 void SoftwareOutputDeviceOzoneTest::TearDown() {
   output_device_.reset();
   compositor_.reset();
-  surface_factory_.reset();
+  window_.reset();
   ui::TerminateContextFactoryForTests();
 }
 
 class SoftwareOutputDeviceOzonePixelTest
     : public SoftwareOutputDeviceOzoneTest {
  protected:
   virtual void SetUp() override;
 };
 
 void SoftwareOutputDeviceOzonePixelTest::SetUp() {
@@ skipping 54 matching lines @@
   const SkPMColor black = SkPreMultiplyColor(SK_ColorBLACK);
   for (int i = 0; i < area.height(); ++i) {
     for (int j = 0; j < area.width(); ++j) {
       if (j < damage.width() && i < damage.height())
         EXPECT_EQ(white, pixels[i * area.width() + j]);
       else
         EXPECT_EQ(black, pixels[i * area.width() + j]);
     }
   }
 }