Reland of 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 3a509960976ba9f1881d07da205a382e3b708a8e..678976b904bc4f56b3e82ea8e1b125d60325efdf 100644
--- a/ui/ozone/public/surface_factory_ozone.h
+++ b/ui/ozone/public/surface_factory_ozone.h
@@ -8,16 +8,11 @@
 #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 {
 
 class NativePixmap;
@@ -78,12 +73,6 @@ class OZONE_BASE_EXPORT SurfaceFactoryOzone {
   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.
   virtual intptr_t GetNativeDisplay();
@@ -159,8 +148,12 @@ class OZONE_BASE_EXPORT SurfaceFactoryOzone {
   // such as MAP for zero copy or SCANOUT for display controller.
   virtual bool CanCreateNativePixmap(BufferUsage usage);
 
+ protected:
+  SurfaceFactoryOzone();
+  virtual ~SurfaceFactoryOzone();
+
  private:
-  static SurfaceFactoryOzone* impl_;  // not owned
+  DISALLOW_COPY_AND_ASSIGN(SurfaceFactoryOzone);
 };
 
 }  // namespace ui