GLContext no longer holds a pointer to a GLSurface.

gpu/command_buffer/service/gles2_cmd_decoder_mock.h

Index: gpu/command_buffer/service/gles2_cmd_decoder_mock.h
===================================================================
--- gpu/command_buffer/service/gles2_cmd_decoder_mock.h	(revision 86168)
+++ gpu/command_buffer/service/gles2_cmd_decoder_mock.h	(working copy)
@@ -14,9 +14,13 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gfx/size.h"
 
-namespace gpu {
+namespace gfx {
 class GLContext;
+class GLSurface;
+}
 
+namespace gpu {
+
 namespace gles2 {
 
 class ContextGroup;
@@ -25,8 +29,9 @@
   MockGLES2Decoder();
   virtual ~MockGLES2Decoder();
 
-  MOCK_METHOD7(Initialize,
-               bool(gfx::GLContext* context,
+  MOCK_METHOD8(Initialize,
+               bool(gfx::GLSurface* surface,
+                    gfx::GLContext* context,
                     const gfx::Size& size,
                     const DisallowedExtensions& disallowed_extensions,
                     const char* allowed_extensions,
@@ -39,6 +44,7 @@
   MOCK_METHOD0(MakeCurrent, bool());
   MOCK_METHOD1(GetServiceIdForTesting, uint32(uint32 client_id));
   MOCK_METHOD0(GetGLES2Util, GLES2Util*());
+  MOCK_METHOD0(GetGLSurface, gfx::GLSurface*());
   MOCK_METHOD0(GetGLContext, gfx::GLContext*());
   MOCK_METHOD0(GetContextGroup, ContextGroup*());
   MOCK_METHOD1(SetResizeCallback, void(Callback1<gfx::Size>::Type*));