Convert Ozone GBM to use new surface API.

ui/ozone/common/egl_util.cc

 // Copyright 2014 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/ozone/common/egl_util.h"
 
 #include "base/files/file_path.h"
+#include "ui/gl/egl_util.h"
+#include "ui/gl/gl_bindings.h"
 
 namespace ui {
 namespace {
 
 const char kDefaultEglSoname[] = "libEGL.so.1";
 const char kDefaultGlesSoname[] = "libGLESv2.so.2";
 
 }  // namespace
 
 bool LoadDefaultEGLGLES2Bindings(
@@ skipping 37 matching lines @@
     return false;
   }
 
   set_gl_get_proc_address.Run(get_proc_address);
   add_gl_library.Run(egl_library);
   add_gl_library.Run(gles_library);
 
   return true;
 }
 
+EGLConfig ChooseEGLConfig(EGLDisplay display, const int32_t* attributes) {
+  int32_t num_configs;
+  if (!eglChooseConfig(display, attributes, nullptr, 0, &num_configs)) {
+    LOG(ERROR) << "eglChooseConfig failed with error "
+               << GetLastEGLErrorString();
+    return nullptr;
+  }
+
+  if (num_configs == 0) {
+    LOG(ERROR) << "No suitable EGL configs found.";
+    return nullptr;
+  }
+
+  EGLConfig config;
+  if (!eglChooseConfig(display, attributes, &config, 1, &num_configs)) {
+    LOG(ERROR) << "eglChooseConfig failed with error "
+               << GetLastEGLErrorString();
+    return nullptr;
+  }
+  return config;
+}
+
 void* /* EGLConfig */ ChooseEGLConfig(const EglConfigCallbacks& egl,
                                       const int32_t* attributes) {
   void* config;
   int32_t num_configs;
   if (!egl.choose_config.Run(attributes, nullptr, 0, &num_configs)) {
     LOG(ERROR) << "eglChooseConfig failed with error "
                << egl.get_last_error_string.Run();
     return nullptr;
   }
 
   if (num_configs == 0) {
     LOG(ERROR) << "No suitable EGL configs found.";
     return nullptr;
   }
 
   if (!egl.choose_config.Run(attributes, &config, 1, &num_configs)) {
     LOG(ERROR) << "eglChooseConfig failed with error "
                << egl.get_last_error_string.Run();
     return nullptr;
   }
   return config;
 }
 
 }  // namespace ui