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

gpu/command_buffer/service/gl_surface_mock.h

Index: gpu/command_buffer/service/gl_surface_mock.h
diff --git a/gpu/command_buffer/service/gl_surface_mock.h b/gpu/command_buffer/service/gl_surface_mock.h
index 058089c87b0f88a610b534bf899f7b08686d54de..fad255a5bae351b286154117d1a1efb1dc6611e3 100644
--- a/gpu/command_buffer/service/gl_surface_mock.h
+++ b/gpu/command_buffer/service/gl_surface_mock.h
@@ -12,11 +12,11 @@
 
 namespace gpu {
 
-class GLSurfaceMock : public gfx::GLSurface {
+class GLSurfaceMock : public gl::GLSurface {
  public:
   GLSurfaceMock();
 
-  MOCK_METHOD1(Initialize, bool(gfx::GLSurface::Format format));
+  MOCK_METHOD1(Initialize, bool(gl::GLSurface::Format format));
   MOCK_METHOD0(Destroy, void());
   MOCK_METHOD3(Resize,
                bool(const gfx::Size& size, float scale_factor, bool alpha));
@@ -28,7 +28,7 @@ class GLSurfaceMock : public gfx::GLSurface {
   MOCK_METHOD0(GetSize, gfx::Size());
   MOCK_METHOD0(GetHandle, void*());
   MOCK_METHOD0(GetBackingFrameBufferObject, unsigned int());
-  MOCK_METHOD1(OnMakeCurrent, bool(gfx::GLContext* context));
+  MOCK_METHOD1(OnMakeCurrent, bool(gl::GLContext* context));
   MOCK_METHOD1(SetBackbufferAllocation, bool(bool allocated));
   MOCK_METHOD1(SetFrontbufferAllocation, void(bool allocated));
   MOCK_METHOD0(GetShareHandle, void*());