Move code in ui/gl/* from gfx:: to gl::

content/browser/android/child_process_launcher_android.cc

 // Copyright (c) 2012 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 "content/browser/android/child_process_launcher_android.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 66 matching lines @@
     return;
   }
 
   media::MediaPlayerAndroid* player = player_manager->GetPlayer(player_id);
   if (!player) {
     DVLOG(1) << "Cannot find media player for player_id " << player_id;
     return;
   }
 
   if (player != player_manager->GetFullscreenPlayer()) {
-    gfx::ScopedJavaSurface scoped_surface(surface);
+    gl::ScopedJavaSurface scoped_surface(surface);
     player->SetVideoSurface(std::move(scoped_surface));
   }
 }
 
 void LaunchDownloadProcess(base::CommandLine* cmd_line) {
   std::unique_ptr<base::CommandLine> cmd_line_deleter(cmd_line);
 
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
 
@@ skipping 142 matching lines @@
   DCHECK(env);
   Java_ChildProcessLauncher_registerViewSurface(env, surface_id, j_surface);
 }
 
 void UnregisterViewSurface(int surface_id) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
   Java_ChildProcessLauncher_unregisterViewSurface(env, surface_id);
 }
 
-gfx::ScopedJavaSurface GetViewSurface(int surface_id) {
+gl::ScopedJavaSurface GetViewSurface(int surface_id) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
-  return gfx::ScopedJavaSurface::AcquireExternalSurface(
+  return gl::ScopedJavaSurface::AcquireExternalSurface(
       Java_ChildProcessLauncher_getViewSurface(env, surface_id).obj());
 }
 
 void CreateSurfaceTextureSurface(int surface_texture_id,
                                  int client_id,
-                                 gfx::SurfaceTexture* surface_texture) {
+                                 gl::SurfaceTexture* surface_texture) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
   Java_ChildProcessLauncher_createSurfaceTextureSurface(
       env,
       surface_texture_id,
       client_id,
       surface_texture->j_surface_texture().obj());
 }
 
 void DestroySurfaceTextureSurface(int surface_texture_id, int client_id) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
   Java_ChildProcessLauncher_destroySurfaceTextureSurface(
       env, surface_texture_id, client_id);
 }
 
-gfx::ScopedJavaSurface GetSurfaceTextureSurface(int surface_texture_id,
-                                                int client_id) {
+gl::ScopedJavaSurface GetSurfaceTextureSurface(int surface_texture_id,
+                                               int client_id) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
-  return gfx::ScopedJavaSurface::AcquireExternalSurface(
+  return gl::ScopedJavaSurface::AcquireExternalSurface(
       Java_ChildProcessLauncher_getSurfaceTextureSurface(
-          env, surface_texture_id, client_id).obj());
+          env, surface_texture_id, client_id)
+          .obj());
 }
 
 jboolean IsSingleProcess(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSingleProcess);
 }
 
 bool RegisterChildProcessLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content