Refactor GL surface format handling

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 ae2e72de6206517ae1677e037cced21e2b5cdd3a..10e81debbac509f3e0c68eaae78b21fe177b43f1 100644
--- a/gpu/command_buffer/service/gl_surface_mock.h
+++ b/gpu/command_buffer/service/gl_surface_mock.h
@@ -16,7 +16,7 @@ class GLSurfaceMock : public gl::GLSurface {
  public:
   GLSurfaceMock();
 
-  MOCK_METHOD1(Initialize, bool(gl::GLSurface::Format format));
+  MOCK_METHOD1(Initialize, bool(gl::GLSurfaceFormat format));
   MOCK_METHOD0(Destroy, void());
   MOCK_METHOD3(Resize,
                bool(const gfx::Size& size, float scale_factor, bool alpha));
@@ -34,7 +34,7 @@ class GLSurfaceMock : public gl::GLSurface {
   MOCK_METHOD0(GetShareHandle, void*());
   MOCK_METHOD0(GetDisplay, void*());
   MOCK_METHOD0(GetConfig, void*());
-  MOCK_METHOD0(GetFormat, GLSurface::Format());
+  MOCK_METHOD0(GetFormat, gl::GLSurfaceFormat());
 
  protected:
   virtual ~GLSurfaceMock();