[Ozone] Update gfx::SurfaceFactoryOzone interface in content_unittests

content/browser/aura/software_output_device_ozone_unittest.cc

 // Copyright 2013 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/aura/software_output_device_ozone.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #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/size.h"
 #include "ui/gfx/skia_util.h"
+#include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace {
 
 class MockSurfaceFactoryOzone : public gfx::SurfaceFactoryOzone {
  public:
   MockSurfaceFactoryOzone() {}
   virtual ~MockSurfaceFactoryOzone() {}
 
   virtual HardwareState InitializeHardware() OVERRIDE {
@@ skipping 14 matching lines @@
     device_ = skia::AdoptRef(new SkBitmapDevice(SkBitmap::kARGB_8888_Config,
                                                 bounds.width(),
                                                 bounds.height(),
                                                 true));
     canvas_ = skia::AdoptRef(new SkCanvas(device_.get()));
     return true;
   }
   virtual SkCanvas* GetCanvasForWidget(gfx::AcceleratedWidget w) OVERRIDE {
     return canvas_.get();
   }
-  virtual gfx::VSyncProvider* GetVSyncProvider(
+  virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider(
       gfx::AcceleratedWidget w) OVERRIDE {
-    return NULL;
+    return scoped_ptr<gfx::VSyncProvider>();
   }
  private:
   skia::RefPtr<SkBitmapDevice> device_;
   skia::RefPtr<SkCanvas> canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(MockSurfaceFactoryOzone);
 };
 
 }  // namespace
 
@@ skipping 123 matching lines @@
   // painted.
   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(SK_ColorWHITE, bitmap.getColor(j, i));
       else
         EXPECT_EQ(SK_ColorBLACK, bitmap.getColor(j, i));
     }
   }
 }