Consolidate GPU unit test expectiation functions.

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 ec563315461a28e9b3244802f2996af9683164c1..961cae23be7775448fa6e37d3f0b5b22e0857691 100644
--- a/gpu/command_buffer/service/test_helper.h
+++ b/gpu/command_buffer/service/test_helper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -39,6 +39,22 @@ class TestHelper {
   static const GLint kMaxVertexUniformVectors = 128;
   static const GLint kMaxVertexUniformComponents = kMaxVertexUniformVectors * 4;
 
+  struct AttribInfo {
+    const char* name;
+    GLint size;
+    GLenum type;
+    GLint location;
+  };
+
+  struct UniformInfo {
+    const char* name;
+    GLint size;
+    GLenum type;
+    GLint fake_location;
+    GLint real_location;
+    const char* good_name;
+  };
+
   static void SetupContextGroupInitExpectations(
       ::gfx::MockGLInterface* gl,
       const DisallowedFeatures& disallowed_features,
@@ -47,6 +63,16 @@ class TestHelper {
       ::gfx::MockGLInterface* gl, const char* extensions);
   static void SetupTextureManagerInitExpectations(::gfx::MockGLInterface* gl,
                                                   const char* extensions);
+
+  static void SetupExpectationsForClearingUniforms(
+      ::gfx::MockGLInterface* gl, UniformInfo* uniforms, size_t num_uniforms);
+
+  static void SetupShader(
+      ::gfx::MockGLInterface* gl,
+      AttribInfo* attribs, size_t num_attribs,
+      UniformInfo* uniforms, size_t num_uniforms,
+      GLuint service_id);
+
  private:
   static void SetupTextureInitializationExpectations(::gfx::MockGLInterface* gl,
                                                      GLenum target);