Split //ui/gl into //ui/gl + //ui/gi/init.

android_webview/browser/test/fake_window.cc

Index: android_webview/browser/test/fake_window.cc
diff --git a/android_webview/browser/test/fake_window.cc b/android_webview/browser/test/fake_window.cc
index 3319db1f736224258c827e614cc79815089efcc6..4b63f741579de4349e7b5beff962510c8b15abdf 100644
--- a/android_webview/browser/test/fake_window.cc
+++ b/android_webview/browser/test/fake_window.cc
@@ -12,6 +12,7 @@
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/gl/gl_bindings.h"
+#include "ui/gl/init/gl_factory.h"
 
 namespace android_webview {
 
@@ -192,11 +193,11 @@ void FakeWindow::CreateRenderThreadIfNeeded() {
 
 void FakeWindow::InitializeOnRT(base::WaitableEvent* sync) {
   CheckCurrentlyOnRT();
-  surface_ = gfx::GLSurface::CreateOffscreenGLSurface(surface_size_);
+  surface_ = gl::init::CreateOffscreenGLSurface(surface_size_);
   DCHECK(surface_);
   DCHECK(surface_->GetHandle());
-  context_ = gfx::GLContext::CreateGLContext(nullptr, surface_.get(),
-                                             gfx::PreferDiscreteGpu);
+  context_ = gl::init::CreateGLContext(nullptr, surface_.get(),
+                                       gfx::PreferDiscreteGpu);
   DCHECK(context_);
   sync->Signal();
 }