Clean up interfaces between Shader / ShaderTranslator / ANGLE side.

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 d0ae758aae77892c4e20e1872b25af688c3ad609..92e929e62aff16e85951480825052e9959c995e5 100644
--- a/gpu/command_buffer/service/test_helper.h
+++ b/gpu/command_buffer/service/test_helper.h
@@ -5,6 +5,7 @@
 #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"
 
@@ -15,6 +16,7 @@ struct DisallowedFeatures;
 class Buffer;
 class BufferManager;
 class MockErrorState;
+class Shader;
 class TextureRef;
 class TextureManager;
 
@@ -107,6 +109,19 @@ class TestHelper {
       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);
+
+  static void SetShaderStates(
+      ::gfx::MockGLInterface* gl, Shader* shader, bool valid);
+
  private:
   static void SetupTextureInitializationExpectations(::gfx::MockGLInterface* gl,
                                                      GLenum target,