Revert "Revert 186416"

gpu/command_buffer/service/test_helper.h

Index: gpu/command_buffer/service/test_helper.h
diff --git a/gpu/command_buffer/service/test_helper.h b/gpu/command_buffer/service/test_helper.h
index 86354c62b14e6c0dae2c147eb383a5160b0b5a03..a97cf74e645501e300fdf86a311c680457d57d9b 100644
--- a/gpu/command_buffer/service/test_helper.h
+++ b/gpu/command_buffer/service/test_helper.h
@@ -11,6 +11,9 @@ namespace gpu {
 namespace gles2 {
 
 struct DisallowedFeatures;
+class Buffer;
+class BufferManager;
+class MockGLES2Decoder;
 
 class TestHelper {
  public:
@@ -86,6 +89,11 @@ class TestHelper {
       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);