Consolidate GPU unit test expectiation functions.

gpu/command_buffer/service/test_helper.h

-// 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_
 
 #include "gpu/command_buffer/common/gl_mock.h"
 
 namespace gpu {
 namespace gles2 {
@@ skipping 20 matching lines @@
   static const GLint kMaxTextureImageUnits = 8;
   static const GLint kMaxVertexTextureImageUnits = 2;
   static const GLint kMaxFragmentUniformVectors = 16;
   static const GLint kMaxFragmentUniformComponents =
       kMaxFragmentUniformVectors * 4;
   static const GLint kMaxVaryingVectors = 8;
   static const GLint kMaxVaryingFloats = kMaxVaryingVectors * 4;
   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,
       const char* extensions);
   static void SetupFeatureInfoInitExpectations(
       ::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);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_