Revert of ozone: Remove singleton pattern for SurfaceFactoryOzone.

ui/ozone/public/surface_factory_ozone.h

Index: ui/ozone/public/surface_factory_ozone.h
diff --git a/ui/ozone/public/surface_factory_ozone.h b/ui/ozone/public/surface_factory_ozone.h
index 678976b904bc4f56b3e82ea8e1b125d60325efdf..3a509960976ba9f1881d07da205a382e3b708a8e 100644
--- a/ui/ozone/public/surface_factory_ozone.h
+++ b/ui/ozone/public/surface_factory_ozone.h
@@ -8,10 +8,15 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/native_library.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/overlay_transform.h"
 #include "ui/ozone/ozone_base_export.h"
+
+class SkBitmap;
+class SkCanvas;
 
 namespace ui {
 
@@ -72,6 +77,12 @@
   typedef base::Callback<void(base::NativeLibrary)> AddGLLibraryCallback;
   typedef base::Callback<void(GLGetProcAddressProc)>
       SetGLGetProcAddressProcCallback;
+
+  SurfaceFactoryOzone();
+  virtual ~SurfaceFactoryOzone();
+
+  // Returns the singleton instance.
+  static SurfaceFactoryOzone* GetInstance();
 
   // Returns native platform display handle. This is used to obtain the EGL
   // display connection for the native display.
@@ -148,12 +159,8 @@
   // such as MAP for zero copy or SCANOUT for display controller.
   virtual bool CanCreateNativePixmap(BufferUsage usage);
 
- protected:
-  SurfaceFactoryOzone();
-  virtual ~SurfaceFactoryOzone();
-
  private:
-  DISALLOW_COPY_AND_ASSIGN(SurfaceFactoryOzone);
+  static SurfaceFactoryOzone* impl_;  // not owned
 };
 
 }  // namespace ui