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

content/browser/media/android/browser_surface_view_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_SURFACE_VIEW_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_SURFACE_VIEW_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 10 matching lines @@
 // BrowserSurfaceViewManager creates and owns a ContentVideoView on behalf of
 // a fullscreen media player. Its SurfaceView is registered so that a decoder
 // in the GPU process can look it up and render to it.
 class CONTENT_EXPORT BrowserSurfaceViewManager
     : public ContentVideoView::Client {
  public:
   explicit BrowserSurfaceViewManager(RenderFrameHost* render_frame_host);
   ~BrowserSurfaceViewManager();
 
   // ContentVideoView::Client overrides.
-  void SetVideoSurface(gfx::ScopedJavaSurface surface) override;
+  void SetVideoSurface(gl::ScopedJavaSurface surface) override;
   void DidExitFullscreen(bool release_media_player) override;
 
   void OnCreateFullscreenSurface(const gfx::Size& video_natural_size);
   void OnNaturalSizeChanged(const gfx::Size& size);
 
  private:
   // Send a message to return the surface id to the caller.
   bool SendSurfaceID(int surface_id);
 
   // Synchronously notify the decoder that the surface is being destroyed so it
@@ skipping 11 matching lines @@
 
   // The fullscreen view that contains a SurfaceView.
   std::unique_ptr<ContentVideoView> content_video_view_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserSurfaceViewManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_SURFACE_VIEW_MANAGER_H_