ozone: Add OzoneSurface object that is owned by compositor, GLSurface

ui/gfx/ozone/impl/file_surface_factory.h

Index: ui/gfx/ozone/impl/file_surface_factory.h
diff --git a/ui/gfx/ozone/impl/file_surface_factory.h b/ui/gfx/ozone/impl/file_surface_factory.h
index b3b2cc03549ad83a0e09aad2b862e5b3273ba639..11f937cb7acf19c72b234d8cc28d87825a963867 100644
--- a/ui/gfx/ozone/impl/file_surface_factory.h
+++ b/ui/gfx/ozone/impl/file_surface_factory.h
@@ -9,7 +9,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/ozone/surface_factory_ozone.h"
-#include "ui/gfx/skia_util.h"
 
 class SkBitmapDevice;
 class SkCanvas;
@@ -26,21 +25,13 @@ class GFX_EXPORT FileSurfaceFactory : public SurfaceFactoryOzone {
   virtual HardwareState InitializeHardware() OVERRIDE;
   virtual void ShutdownHardware() OVERRIDE;
   virtual AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
-  virtual AcceleratedWidget RealizeAcceleratedWidget(
+  virtual scoped_ptr<SurfaceOzone> CreateSurfaceForWidget(
       AcceleratedWidget widget) OVERRIDE;
   virtual bool LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE;
-  virtual bool AttemptToResizeAcceleratedWidget(AcceleratedWidget widget,
-                                                const Rect& bounds) OVERRIDE;
-  virtual bool SchedulePageFlip(AcceleratedWidget widget) OVERRIDE;
-  virtual SkCanvas* GetCanvasForWidget(AcceleratedWidget widget) OVERRIDE;
-  virtual scoped_ptr<VSyncProvider> CreateVSyncProvider(
-      AcceleratedWidget widget) OVERRIDE;
 
   base::FilePath location_;
-  skia::RefPtr<SkBitmapDevice> device_;
-  skia::RefPtr<SkCanvas> canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSurfaceFactory);
 };