Revert 186416

gpu/command_buffer/service/test_helper.h

 // Copyright (c) 2012 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_
 
 #include "ui/gl/gl_mock.h"
 
 namespace gpu {
 namespace gles2 {
 
 struct DisallowedFeatures;
-class Buffer;
-class BufferManager;
-class MockGLES2Decoder;
 
 class TestHelper {
  public:
   static const GLuint kServiceBlackTexture2dId = 701;
   static const GLuint kServiceDefaultTexture2dId = 702;
   static const GLuint kServiceBlackTextureCubemapId = 703;
   static const GLuint kServiceDefaultTextureCubemapId = 704;
   static const GLuint kServiceBlackExternalTextureId = 705;
   static const GLuint kServiceDefaultExternalTextureId = 706;
   static const GLuint kServiceBlackRectangleTextureId = 707;
@@ skipping 55 matching lines @@
       ::gfx::MockGLInterface* gl,
       AttribInfo* attribs, size_t num_attribs,
       UniformInfo* uniforms, size_t num_uniforms,
       GLuint service_id);
 
   static void SetupProgramSuccessExpectations(::gfx::MockGLInterface* gl,
       AttribInfo* attribs, size_t num_attribs,
       UniformInfo* uniforms, size_t num_uniforms,
       GLuint service_id);
 
-  static void DoBufferData(
-      ::gfx::MockGLInterface* gl, MockGLES2Decoder* decoder,
-      BufferManager* manager, Buffer* buffer, GLsizeiptr size, GLenum usage,
-      const GLvoid* data, GLenum error);
-
  private:
   static void SetupTextureInitializationExpectations(
        ::gfx::MockGLInterface* gl, GLenum target);
   static void SetupTextureDestructionExpectations(
        ::gfx::MockGLInterface* gl, GLenum target);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_