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

ui/gl/init/gl_initializer_ozone.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gl/init/gl_initializer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_egl_api_implementation.h"
 #include "ui/gl/gl_gl_api_implementation.h"
 #include "ui/gl/gl_implementation_osmesa.h"
 #include "ui/gl/gl_osmesa_api_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace gl {
 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;
   }
 
   SetGLImplementation(kGLImplementationEGLGLES2);
   InitializeStaticGLBindingsGL();
   InitializeStaticGLBindingsEGL();
 
   return true;
 }
 
 }  // namespace
 
 bool InitializeGLOneOffPlatform() {
   switch (GetGLImplementation()) {
     case kGLImplementationEGLGLES2:
+      GLSurfaceEGL::SetNativeDisplay(GetSurfaceFactory()->GetNativeDisplay());
       if (!GLSurfaceEGL::InitializeOneOff()) {
         LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
         return false;
       }
       return true;
     case kGLImplementationOSMesaGL:
     case kGLImplementationMockGL:
       return true;
     default:
       return false;
@@ skipping 30 matching lines @@
 }
 
 void ClearGLBindingsPlatform() {
   ClearGLBindingsEGL();
   ClearGLBindingsGL();
   ClearGLBindingsOSMESA();
 }
 
 }  // namespace init
 }  // namespace gl