Break //ui/gl/ dependency on //ui/ozone.

ui/gl/init/gl_initializer_ozone.cc

Index: ui/gl/init/gl_initializer_ozone.cc
diff --git a/ui/gl/init/gl_initializer_ozone.cc b/ui/gl/init/gl_initializer_ozone.cc
index d53f3444bd9a953341ba2609f672412149a52ad2..300065371f86cf943ef8925b705ebe8abe095f1d 100644
--- a/ui/gl/init/gl_initializer_ozone.cc
+++ b/ui/gl/init/gl_initializer_ozone.cc
@@ -20,10 +20,12 @@ namespace init {
 
 namespace {
 
+ui::SurfaceFactoryOzone* GetSurfaceFactory() {
+  return ui::OzonePlatform::GetInstance()->GetSurfaceFactoryOzone();
+}
+
 bool InitializeStaticEGLInternal() {
-  auto surface_factory =
-      ui::OzonePlatform::GetInstance()->GetSurfaceFactoryOzone();
-  if (!surface_factory->LoadEGLGLES2Bindings(
+  if (!GetSurfaceFactory()->LoadEGLGLES2Bindings(
           base::Bind(&AddGLNativeLibrary),
           base::Bind(&SetGLGetProcAddressProc))) {
     return false;
@@ -41,6 +43,7 @@ bool InitializeStaticEGLInternal() {
 bool InitializeGLOneOffPlatform() {
   switch (GetGLImplementation()) {
     case kGLImplementationEGLGLES2:
+      GLSurfaceEGL::SetNativeDisplay(GetSurfaceFactory()->GetNativeDisplay());
       if (!GLSurfaceEGL::InitializeOneOff()) {
         LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
         return false;