- Updating unittests to conform to Ozone interface change.

 - Updating unittests to conform to Compositor constructor change.

BUG=

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

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

content/browser/aura/software_output_device_ozone_unittest.cc

@@ -30,7 +30,11 @@ class MockSurfaceFactoryOzone : public gfx::SurfaceFactoryOzone {
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE { return 1; }
   virtual gfx::AcceleratedWidget RealizeAcceleratedWidget(
       gfx::AcceleratedWidget w) OVERRIDE { return w; }
-  virtual bool LoadEGLGLES2Bindings() OVERRIDE { return false; }
+  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 {
     device_ = skia::AdoptRef(new SkBitmapDevice(SkBitmap::kARGB_8888_Config,
@@ -91,7 +95,8 @@ void SoftwareOutputDeviceOzoneTest::SetUp() {
   gfx::SurfaceFactoryOzone::SetInstance(surface_factory_.get());
 
   const gfx::Size size(500, 400);
-  compositor_.reset(new ui::Compositor(gfx::SurfaceFactoryOzone::GetInstance()
+  compositor_.reset(new ui::Compositor(true,
+                                       gfx::SurfaceFactoryOzone::GetInstance()
                                            ->GetAcceleratedWidget()));
   compositor_->SetScaleAndSize(1.0f, size);