| Index: gpu/command_buffer/service/program_cache.h
 | 
| diff --git a/gpu/command_buffer/service/program_cache.h b/gpu/command_buffer/service/program_cache.h
 | 
| index 3fb5687e8b1d07e7a8212dc91f242f03b529b667..624c436016f7c834f235bfe21093618884d316bc 100644
 | 
| --- a/gpu/command_buffer/service/program_cache.h
 | 
| +++ b/gpu/command_buffer/service/program_cache.h
 | 
| @@ -18,7 +18,6 @@ namespace gpu {
 | 
|  namespace gles2 {
 | 
|  
 | 
|  class Shader;
 | 
| -class ShaderTranslator;
 | 
|  
 | 
|  // Program cache base class for caching linked gpu programs
 | 
|  class GPU_EXPORT ProgramCache {
 | 
| @@ -41,10 +40,8 @@ class GPU_EXPORT ProgramCache {
 | 
|    virtual ~ProgramCache();
 | 
|  
 | 
|    LinkedProgramStatus GetLinkedProgramStatus(
 | 
| -      const std::string& untranslated_shader_a,
 | 
| -      const ShaderTranslatorInterface* translator_a,
 | 
| -      const std::string& untranslated_shader_b,
 | 
| -      const ShaderTranslatorInterface* translator_b,
 | 
| +      const std::string& shader_signature_a,
 | 
| +      const std::string& shader_signature_b,
 | 
|        const LocationMap* bind_attrib_location_map) const;
 | 
|  
 | 
|    // Loads the linked program from the cache.  If the program is not found or
 | 
| @@ -52,9 +49,7 @@ class GPU_EXPORT ProgramCache {
 | 
|    virtual ProgramLoadResult LoadLinkedProgram(
 | 
|        GLuint program,
 | 
|        Shader* shader_a,
 | 
| -      const ShaderTranslatorInterface* translator_a,
 | 
|        Shader* shader_b,
 | 
| -      const ShaderTranslatorInterface* translator_b,
 | 
|        const LocationMap* bind_attrib_location_map,
 | 
|        const ShaderCacheCallback& shader_callback) = 0;
 | 
|  
 | 
| @@ -63,9 +58,7 @@ class GPU_EXPORT ProgramCache {
 | 
|    virtual void SaveLinkedProgram(
 | 
|        GLuint program,
 | 
|        const Shader* shader_a,
 | 
| -      const ShaderTranslatorInterface* translator_a,
 | 
|        const Shader* shader_b,
 | 
| -      const ShaderTranslatorInterface* translator_b,
 | 
|        const LocationMap* bind_attrib_location_map,
 | 
|        const ShaderCacheCallback& shader_callback) = 0;
 | 
|  
 | 
| @@ -75,10 +68,8 @@ class GPU_EXPORT ProgramCache {
 | 
|    void Clear();
 | 
|  
 | 
|    // Only for testing
 | 
| -  void LinkedProgramCacheSuccess(const std::string& shader_a,
 | 
| -                                 const ShaderTranslatorInterface* translator_a,
 | 
| -                                 const std::string& shader_b,
 | 
| -                                 const ShaderTranslatorInterface* translator_b,
 | 
| +  void LinkedProgramCacheSuccess(const std::string& shader_signature_a,
 | 
| +                                 const std::string& shader_signature_b,
 | 
|                                   const LocationMap* bind_attrib_location_map);
 | 
|  
 | 
|   protected:
 | 
| @@ -87,7 +78,6 @@ class GPU_EXPORT ProgramCache {
 | 
|  
 | 
|    // result is not null terminated
 | 
|    void ComputeShaderHash(const std::string& shader,
 | 
| -                         const ShaderTranslatorInterface* translator,
 | 
|                           char* result) const;
 | 
|  
 | 
|    // result is not null terminated.  hashed shaders are expected to be
 | 
| 
 |