Switch to use ANGLE's new APIs to query shader variables.

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 "gpu/command_buffer/service/shader_translator.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_mock.h"
@@ skipping 96 matching lines @@
   static void SetTexParameteriWithExpectations(
       ::gfx::MockGLInterface* gl, MockErrorState* error_state,
       TextureManager* manager, TextureRef* texture_ref,
       GLenum pname, GLint value, GLenum error);
 
   static void SetShaderStates(
       ::gfx::MockGLInterface* gl, Shader* shader,
       bool expected_valid,
       const std::string* const expected_log_info,
       const std::string* const expected_translated_source,
-      const ShaderTranslatorInterface::VariableMap* const expected_attrib_map,
-      const ShaderTranslatorInterface::VariableMap* const expected_uniform_map,
-      const ShaderTranslatorInterface::VariableMap* const expected_varying_map,
-      const ShaderTranslatorInterface::NameMap* const expected_name_map);
+      const AttributeMap* const expected_attrib_map,
+      const UniformMap* const expected_uniform_map,
+      const VaryingMap* const expected_varying_map,
+      const NameMap* const expected_name_map);
 
   static void SetShaderStates(
       ::gfx::MockGLInterface* gl, Shader* shader, bool valid);
 
+  static sh::Attribute ConstructAttribute(
+      GLenum type, GLint array_size, GLenum precision,
+      bool static_use, const std::string& name);
+  static sh::Uniform ConstructUniform(
+      GLenum type, GLint array_size, GLenum precision,
+      bool static_use, const std::string& name);
+  static sh::Varying ConstructVarying(
+      GLenum type, GLint array_size, GLenum precision,
+      bool static_use, const std::string& name);
+
  private:
   static void SetupTextureInitializationExpectations(::gfx::MockGLInterface* gl,
                                                      GLenum target,
                                                      bool use_default_textures);
   static void SetupTextureDestructionExpectations(::gfx::MockGLInterface* gl,
                                                   GLenum target,
                                                   bool use_default_textures);
 };
 
 // This object temporaritly Sets what gfx::GetGLImplementation returns. During
 // testing the GLImplementation is set to kGLImplemenationMockGL but lots of
 // code branches based on what gfx::GetGLImplementation returns.
 class ScopedGLImplementationSetter {
  public:
   explicit ScopedGLImplementationSetter(gfx::GLImplementation implementation);
   ~ScopedGLImplementationSetter();
 
  private:
   gfx::GLImplementation old_implementation_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_