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

android_webview/browser/test/fake_window.cc

 // 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.
 
 #include "android_webview/browser/test/fake_window.h"
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/render_thread_manager.h"
 #include "base/location.h"
@@ skipping 163 matching lines @@
       FROM_HERE, base::Bind(&FakeWindow::InitializeOnRT, base::Unretained(this),
                             &completion));
   completion.Wait();
 }
 
 void FakeWindow::InitializeOnRT(base::WaitableEvent* sync) {
   CheckCurrentlyOnRT();
   surface_ = gl::init::CreateOffscreenGLSurface(surface_size_);
   DCHECK(surface_);
   DCHECK(surface_->GetHandle());
-  context_ = gl::init::CreateGLContext(nullptr, surface_.get(),
-                                       gfx::PreferDiscreteGpu);
+  context_ =
+      gl::init::CreateGLContext(nullptr, surface_.get(), gl::PreferDiscreteGpu);
   DCHECK(context_);
   sync->Signal();
 }
 
 void FakeWindow::DestroyOnRT(base::WaitableEvent* sync) {
   CheckCurrentlyOnRT();
   if (context_) {
     DCHECK(!context_->IsCurrent(surface_.get()));
     context_ = nullptr;
     surface_ = nullptr;
@@ skipping 64 matching lines @@
 
 bool FakeFunctor::RequestInvokeGL(bool wait_for_completion) {
   DCHECK(window_);
   window_->RequestInvokeGL(this, wait_for_completion);
   return true;
 }
 
 void FakeFunctor::DetachFunctorFromView() {}
 
 }  // namespace android_webview