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

android_webview/browser/test/fake_window.h

 // 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_TEST_FAKE_WINDOW_H_
 #define ANDROID_WEBVIEW_BROWSER_TEST_FAKE_WINDOW_H_
 
 #include <map>
 
 #include "android_webview/browser/render_thread_manager_client.h"
@@ skipping 69 matching lines @@
 
   // UI thread members.
   gfx::Rect location_;
   bool on_draw_hardware_pending_;
   base::SequenceChecker ui_checker_;
 
   // Render thread members.
   std::unique_ptr<base::Thread> render_thread_;
   base::SequenceChecker rt_checker_;
   scoped_refptr<base::SingleThreadTaskRunner> render_thread_loop_;
-  scoped_refptr<gfx::GLSurface> surface_;
-  scoped_refptr<gfx::GLContext> context_;
+  scoped_refptr<gl::GLSurface> surface_;
+  scoped_refptr<gl::GLContext> context_;
   bool context_current_;
 
   base::WeakPtrFactory<FakeWindow> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeWindow);
 };
 
 class FakeFunctor : public RenderThreadManagerClient {
  public:
   using DrawGLCallback = base::Callback<void(AwDrawGLInfo*)>;
@@ skipping 16 matching lines @@
  private:
   FakeWindow* window_;
   DrawGLCallback callback_;
   std::unique_ptr<RenderThreadManager> render_thread_manager_;
   gfx::Rect committed_location_;
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_TEST_FAKE_WINDOW_H_