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

gpu/command_buffer/service/memory_program_cache.h

Index: gpu/command_buffer/service/memory_program_cache.h
diff --git a/gpu/command_buffer/service/memory_program_cache.h b/gpu/command_buffer/service/memory_program_cache.h
index 56e59792ef74985ce73533c5bb2a937469e2cbed..804547ea4be192fed68ba6ea754241fa07d6cb9d 100644
--- a/gpu/command_buffer/service/memory_program_cache.h
+++ b/gpu/command_buffer/service/memory_program_cache.h
@@ -55,13 +55,13 @@ class GPU_EXPORT MemoryProgramCache : public ProgramCache {
                       const char* data,
                       const std::string& program_hash,
                       const char* shader_0_hash,
-                      const ShaderTranslator::VariableMap& attrib_map_0,
-                      const ShaderTranslator::VariableMap& uniform_map_0,
-                      const ShaderTranslator::VariableMap& varying_map_0,
+                      const AttributeMap& attrib_map_0,
+                      const UniformMap& uniform_map_0,
+                      const VaryingMap& varying_map_0,
                       const char* shader_1_hash,
-                      const ShaderTranslator::VariableMap& attrib_map_1,
-                      const ShaderTranslator::VariableMap& uniform_map_1,
-                      const ShaderTranslator::VariableMap& varying_map_1,
+                      const AttributeMap& attrib_map_1,
+                      const UniformMap& uniform_map_1,
+                      const VaryingMap& varying_map_1,
                       MemoryProgramCache* program_cache);
 
     GLsizei length() const {
@@ -80,15 +80,15 @@ class GPU_EXPORT MemoryProgramCache : public ProgramCache {
       return shader_0_hash_;
     }
 
-    const ShaderTranslator::VariableMap& attrib_map_0() const {
+    const AttributeMap& attrib_map_0() const {
       return attrib_map_0_;
     }
 
-    const ShaderTranslator::VariableMap& uniform_map_0() const {
+    const UniformMap& uniform_map_0() const {
       return uniform_map_0_;
     }
 
-    const ShaderTranslator::VariableMap& varying_map_0() const {
+    const VaryingMap& varying_map_0() const {
       return varying_map_0_;
     }
 
@@ -96,15 +96,15 @@ class GPU_EXPORT MemoryProgramCache : public ProgramCache {
       return shader_1_hash_;
     }
 
-    const ShaderTranslator::VariableMap& attrib_map_1() const {
+    const AttributeMap& attrib_map_1() const {
       return attrib_map_1_;
     }
 
-    const ShaderTranslator::VariableMap& uniform_map_1() const {
+    const UniformMap& uniform_map_1() const {
       return uniform_map_1_;
     }
 
-    const ShaderTranslator::VariableMap& varying_map_1() const {
+    const VaryingMap& varying_map_1() const {
       return varying_map_1_;
     }
 
@@ -118,13 +118,13 @@ class GPU_EXPORT MemoryProgramCache : public ProgramCache {
     const scoped_ptr<const char[]> data_;
     const std::string program_hash_;
     const std::string shader_0_hash_;
-    const ShaderTranslator::VariableMap attrib_map_0_;
-    const ShaderTranslator::VariableMap uniform_map_0_;
-    const ShaderTranslator::VariableMap varying_map_0_;
+    const AttributeMap attrib_map_0_;
+    const UniformMap uniform_map_0_;
+    const VaryingMap varying_map_0_;
     const std::string shader_1_hash_;
-    const ShaderTranslator::VariableMap attrib_map_1_;
-    const ShaderTranslator::VariableMap uniform_map_1_;
-    const ShaderTranslator::VariableMap varying_map_1_;
+    const AttributeMap attrib_map_1_;
+    const UniformMap uniform_map_1_;
+    const VaryingMap varying_map_1_;
     MemoryProgramCache* const program_cache_;
 
     DISALLOW_COPY_AND_ASSIGN(ProgramCacheValue);