Reland of Revert of ozone: Remove singleton pattern for SurfaceFactoryOzone.

ui/gl/gl_implementation_ozone.cc

Index: ui/gl/gl_implementation_ozone.cc
diff --git a/ui/gl/gl_implementation_ozone.cc b/ui/gl/gl_implementation_ozone.cc
index 2a85720da5f182d970162f271601c27fe7e8f43c..715084f50dbf552aea987354bb6b63e3aadc018d 100644
--- a/ui/gl/gl_implementation_ozone.cc
+++ b/ui/gl/gl_implementation_ozone.cc
@@ -44,9 +44,10 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
     case kGLImplementationOSMesaGL:
       return InitializeStaticGLBindingsOSMesaGL();
     case kGLImplementationEGLGLES2:
-      if (!ui::SurfaceFactoryOzone::GetInstance()->LoadEGLGLES2Bindings(
-              base::Bind(&AddGLNativeLibrary),
-              base::Bind(&SetGLGetProcAddressProc)))
+      if (!ui::OzonePlatform::GetInstance()
+               ->GetSurfaceFactoryOzone()
+               ->LoadEGLGLES2Bindings(base::Bind(&AddGLNativeLibrary),
+                                      base::Bind(&SetGLGetProcAddressProc)))
         return false;
       SetGLImplementation(kGLImplementationEGLGLES2);
       InitializeStaticGLBindingsGL();