[Ozone] Fix content_unittests due to changes in the Ozone API

TBR=danakj@chromium.org, rjkroege@chromium.org
NOTRY=true

TESTS=Manually ran content_unittests --gtest_filter=*Ozone*

Review URL: https://codereview.chromium.org/218273004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260681 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 28 insertions, 12 deletions

diff --git a/content/browser/compositor/software_output_device_ozone_unittest.cc b/content/browser/compositor/software_output_device_ozone_unittest.cc
index ed94e9f..61b159e 100644
--- a/content/browser/compositor/software_output_device_ozone_unittest.cc
+++ b/content/browser/compositor/software_output_device_ozone_unittest.cc
@@ -11,6 +11,7 @@
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/gfx/ozone/surface_factory_ozone.h"
+#include "ui/gfx/ozone/surface_ozone_base.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vsync_provider.h"
@@ -18,6 +19,28 @@
 
 namespace {
 
+class MockSurfaceOzone : public gfx::SurfaceOzoneBase {
+ public:
+  MockSurfaceOzone() {}
+  virtual ~MockSurfaceOzone() {}
+
+  // gfx::SurfaceOzoneBase overrides:
+  virtual bool InitializeCanvas() { return true; }
+  virtual bool ResizeCanvas(const gfx::Size& size) {
+    surface_ = skia::AdoptRef(SkSurface::NewRaster(
+        SkImageInfo::MakeN32Premul(size.width(), size.height())));
+    return true;
+  }
+  virtual skia::RefPtr<SkCanvas> GetCanvas() {
+    return skia::SharePtr(surface_->getCanvas());
+  }
+
+ private:
+  skia::RefPtr<SkSurface> surface_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockSurfaceOzone);
+};
+
 class MockSurfaceFactoryOzone : public gfx::SurfaceFactoryOzone {
  public:
   MockSurfaceFactoryOzone() {}
@@ -29,29 +52,21 @@ class MockSurfaceFactoryOzone : public gfx::SurfaceFactoryOzone {
 
   virtual void ShutdownHardware() OVERRIDE {}
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE { return 1; }
-  virtual gfx::AcceleratedWidget RealizeAcceleratedWidget(
-      gfx::AcceleratedWidget w) OVERRIDE { return w; }
   virtual bool LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE {
     return false;
   }
-  virtual bool AttemptToResizeAcceleratedWidget(
-      gfx::AcceleratedWidget w, const gfx::Rect& bounds) OVERRIDE {
-    surface_ = skia::AdoptRef(SkSurface::NewRaster(
-        SkImageInfo::MakeN32Premul(bounds.width(), bounds.height())));
-    return true;
-  }
-  virtual SkCanvas* GetCanvasForWidget(gfx::AcceleratedWidget w) OVERRIDE {
-    return surface_->getCanvas();
+  virtual scoped_ptr<gfx::SurfaceOzone> CreateSurfaceForWidget(
+      gfx::AcceleratedWidget widget) OVERRIDE {
+    return make_scoped_ptr<gfx::SurfaceOzone>(new MockSurfaceOzone());
   }
   virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider(
       gfx::AcceleratedWidget w) OVERRIDE {
     return scoped_ptr<gfx::VSyncProvider>();
   }
- private:
-  skia::RefPtr<SkSurface> surface_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(MockSurfaceFactoryOzone);
 };
 
diff --git a/ui/gfx/ozone/surface_ozone_base.cc b/ui/gfx/ozone/surface_ozone_base.cc
index 6793778..5d748f1 100644
--- a/ui/gfx/ozone/surface_ozone_base.cc
+++ b/ui/gfx/ozone/surface_ozone_base.cc
@@ -4,6 +4,7 @@
 
 #include "ui/gfx/ozone/surface_ozone_base.h"
 
+#include "base/logging.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/vsync_provider.h"