Hook up shader long variable name mapping with GPU command buffer port.

gpu/command_buffer/service/program_manager.h

 // Copyright (c) 2011 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_PROGRAM_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 178 matching lines @@
     // Resets the program.
     void Reset();
 
     // Updates the program info after a successful link.
     void Update();
 
     // Updates the program log info from GL
     void UpdateLogInfo();
 
     const UniformInfo* AddUniformInfo(
-        GLsizei size, GLenum type, GLint location, const std::string& name);
+        GLsizei size, GLenum type, GLint location, const std::string& name,
+        const std::string& original_name);
 
     void GetCorrectedVariableInfo(
         bool use_uniforms, const std::string& name, std::string* corrected_name,
-        GLsizei* size, GLenum* type) const;
+        std::string* original_name, GLsizei* size, GLenum* type) const;
 
     void DetachShaders(ShaderManager* manager);
 
     int use_count_;
 
     GLsizei max_attrib_name_length_;
 
     // Attrib by index.
     AttribInfoVector attrib_infos_;
 
@@ skipping 66 matching lines @@
   void RemoveProgramInfoIfUnused(
       ShaderManager* shader_manager, ProgramInfo* info);
 
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_