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

gpu/command_buffer/service/mocks.h

Index: gpu/command_buffer/service/mocks.h
diff --git a/gpu/command_buffer/service/mocks.h b/gpu/command_buffer/service/mocks.h
index 17c8401ff2c4d4af96d40183f1080b5d92cb6860..87b31360df7483f0b5475040121cb32804a83dcf 100644
--- a/gpu/command_buffer/service/mocks.h
+++ b/gpu/command_buffer/service/mocks.h
@@ -100,9 +100,9 @@ class MockShaderTranslator : public ShaderTranslatorInterface {
       const std::string& shader_source,
       std::string* info_log,
       std::string* translated_source,
-      VariableMap* attrib_map,
-      VariableMap* uniform_map,
-      VariableMap* varying_map,
+      AttributeMap* attrib_map,
+      UniformMap* uniform_map,
+      VaryingMap* varying_map,
       NameMap* name_map));
   MOCK_CONST_METHOD0(
       GetStringForOptionsThatWouldAffectCompilation, std::string());