GLContext no longer holds a pointer to a GLSurface.

gpu/command_buffer/service/gles2_cmd_decoder_mock.h

 // Copyright (c) 2011 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.
 
 // This file contains the mock GLES2Decoder class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_MOCK_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_MOCK_H_
 
 #include <vector>
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "base/callback.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gfx/size.h"
 
+namespace gfx {
+class GLContext;
+class GLSurface;
+}
+
 namespace gpu {
-class GLContext;
 
 namespace gles2 {
 
 class ContextGroup;
 class MockGLES2Decoder : public GLES2Decoder {
  public:
   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,
                     const std::vector<int32>& attribs,
                     GLES2Decoder* parent,
                     uint32 parent_texture_id));
   MOCK_METHOD0(Destroy, void());
   MOCK_METHOD1(ResizeOffscreenFrameBuffer, void(const gfx::Size& size));
   MOCK_METHOD0(UpdateOffscreenFrameBufferSize, bool());
   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*));
   MOCK_METHOD1(SetSwapBuffersCallback, void(Callback0::Type*));
   MOCK_METHOD1(SetLatchCallback, void(const base::Callback<void(bool)>&));
   MOCK_METHOD3(DoCommand, error::Error(unsigned int command,
                                        unsigned int arg_count,
                                        const void* cmd_data));
   MOCK_METHOD2(GetServiceTextureId, bool(uint32 client_texture_id,
                                          uint32* service_texture_id));
   MOCK_CONST_METHOD1(GetCommandName, const char*(unsigned int command_id));
 
   DISALLOW_COPY_AND_ASSIGN(MockGLES2Decoder);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_MOCK_H_