Convert Ozone GBM to use new surface API.

ui/gl/init/gl_factory_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_factory.h"
 
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_context_egl.h"
@@ skipping 46 matching lines @@
       return InitializeGLSurface(new GLSurfaceStub);
     default:
       NOTREACHED();
   }
   return nullptr;
 }
 
 // TODO(kylechar): Remove when all implementations are switched over.
 scoped_refptr<GLSurface> CreateViewGLSurfaceOld(gfx::AcceleratedWidget window) {
   switch (GetGLImplementation()) {
-    case kGLImplementationEGLGLES2: {
+    case kGLImplementationEGLGLES2:
       DCHECK_NE(window, gfx::kNullAcceleratedWidget);
-      scoped_refptr<GLSurface> surface;
-      if (!surface && GLSurfaceEGL::IsEGLSurfacelessContextSupported())
-        surface = CreateViewGLSurfaceOzoneSurfacelessSurfaceImpl(window);
-      if (!surface)
-        surface = CreateViewGLSurfaceOzone(window);
-      return surface;
-    }
+      return CreateViewGLSurfaceOzone(window);
     default:
       NOTREACHED();
-      return nullptr;
   }
+  return nullptr;
 }
 
 // TODO(kylechar): Remove when all implementations are switched over.
 scoped_refptr<GLSurface> CreateOffscreenGLSurfaceOld(const gfx::Size& size) {
   switch (GetGLImplementation()) {
     case kGLImplementationEGLGLES2:
       if (GLSurfaceEGL::IsEGLSurfacelessContextSupported() &&
           (size.width() == 0 && size.height() == 0)) {
         return InitializeGLSurface(new SurfacelessEGL(size));
       } else {
@@ skipping 34 matching lines @@
     return CreateDefaultViewGLSurface(window);
 
   // TODO(kylechar): This is deprecated, remove when possible.
   if (!GetSurfaceFactory()->UseNewSurfaceAPI())
     return CreateViewGLSurfaceOld(window);
 
   return GetSurfaceFactory()->CreateViewGLSurface(GetGLImplementation(),
                                                   window);
 }
 
-// TODO(kylechar): Update to use new API.
 scoped_refptr<GLSurface> CreateSurfacelessViewGLSurface(
     gfx::AcceleratedWidget window) {
   TRACE_EVENT0("gpu", "gl::init::CreateSurfacelessViewGLSurface");
-  if (GetGLImplementation() == kGLImplementationEGLGLES2 &&
-      window != gfx::kNullAcceleratedWidget &&
-      GLSurfaceEGL::IsEGLSurfacelessContextSupported()) {
-    return CreateViewGLSurfaceOzoneSurfaceless(window);
-  }
-  return nullptr;
+
+  return GetSurfaceFactory()->CreateSurfacelessViewGLSurface(
+      GetGLImplementation(), window);
 }
 
 scoped_refptr<GLSurface> CreateOffscreenGLSurface(const gfx::Size& size) {
   TRACE_EVENT0("gpu", "gl::init::CreateOffscreenGLSurface");
 
   if (HasDefaultImplementation(GetGLImplementation()))
     return CreateDefaultOffscreenGLSurface(size);
 
   // TODO(kylechar): This is deprecated, remove when possible.
   if (!GetSurfaceFactory()->UseNewSurfaceAPI())
     return CreateOffscreenGLSurfaceOld(size);
 
   return GetSurfaceFactory()->CreateOffscreenGLSurface(GetGLImplementation(),
                                                        size);
 }
 
 }  // namespace init
 }  // namespace gl