Move GLSurface and rename source files.

ui/gl/BUILD.gn

 # 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.
 
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 use_egl = is_win || is_android || is_linux
 use_glx = use_x11
@@ skipping 78 matching lines @@
     "gl_implementation_mac.cc",
     "gl_implementation_win.cc",
     "gl_osmesa_api_implementation.cc",
     "gl_osmesa_api_implementation.h",
     "gl_share_group.cc",
     "gl_share_group.h",
     "gl_state_restorer.cc",
     "gl_state_restorer.h",
     "gl_surface.cc",
     "gl_surface.h",
-    "gl_surface_android.cc",
     "gl_surface_osmesa.cc",
     "gl_surface_osmesa.h",
     "gl_surface_overlay.cc",
     "gl_surface_overlay.h",
     "gl_surface_stub.cc",
     "gl_surface_stub.h",
-    "gl_surface_win.cc",
     "gl_switches.cc",
     "gl_switches.h",
     "gl_version_info.cc",
     "gl_version_info.h",
     "gpu_switching_manager.cc",
     "gpu_switching_manager.h",
     "gpu_timing.cc",
     "gpu_timing.h",
     "scoped_api.cc",
     "scoped_api.h",
@@ skipping 40 matching lines @@
       "gl_context_egl.cc",
       "gl_context_egl.h",
       "gl_egl_api_implementation.cc",
       "gl_egl_api_implementation.h",
       "gl_fence_egl.cc",
       "gl_fence_egl.h",
       "gl_image_egl.cc",
       "gl_image_egl.h",
       "gl_surface_egl.cc",
       "gl_surface_egl.h",
+      "gl_surface_egl_android.cc",
+      "gl_surface_egl_win.cc",
     ]
   }
   if (is_android || is_linux) {
     sources += [
       "gl_implementation_osmesa.cc",
       "gl_implementation_osmesa.h",
     ]
   }
   if (use_x11) {
     sources += [
       "gl_implementation_x11.cc",
       "gl_surface_egl_x11.cc",
       "gl_surface_egl_x11.h",
       "gl_surface_osmesa_x11.cc",
       "gl_surface_osmesa_x11.h",
-      "gl_surface_x11.cc",
     ]
 
     data_deps = [
       "//third_party/angle:libEGL",
       "//third_party/angle:libGLESv2",
     ]
   }
   if (use_ozone) {
     sources += [
       "gl_image_ozone_native_pixmap.cc",
       "gl_image_ozone_native_pixmap.h",
       "gl_implementation_ozone.cc",
-      "gl_surface_ozone.cc",
-      "gl_surface_ozone.h",
+      "gl_surface_egl_ozone.cc",
     ]
 
     deps += [ "//ui/ozone" ]
   }
   if (use_glx) {
     sources += [
       "gl_bindings_autogen_glx.cc",
       "gl_bindings_autogen_glx.h",
       "gl_context_glx.cc",
       "gl_context_glx.h",
@@ skipping 204 matching lines @@
     sources = [
       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java",
     ]
     public_deps = [
       ":surface_jni_headers",
     ]
     jni_package = "ui/gl"
   }
 }