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

gpu/command_buffer/service/mocks.h

 // Copyright (c) 2012 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.
 
 // This file contains definitions for mock objects, used for testing.
 
 // TODO(apatrick): This file "manually" defines some mock objects. Using gMock
 // would be definitely preferable, unfortunately it doesn't work on Windows yet.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_MOCKS_H_
@@ skipping 82 matching lines @@
   MOCK_METHOD5(Init, bool(
       sh::GLenum shader_type,
       ShShaderSpec shader_spec,
       const ShBuiltInResources* resources,
       GlslImplementationType glsl_implementation_type,
       ShCompileOptions driver_bug_workarounds));
   MOCK_CONST_METHOD7(Translate, bool(
       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());
 };
 
 class MockProgramCache : public ProgramCache {
  public:
   MockProgramCache();
   virtual ~MockProgramCache();
 
@@ skipping 31 matching lines @@
  private:
   friend class ::testing::StrictMock<MockMemoryTracker>;
   friend class base::RefCounted< ::testing::StrictMock<MockMemoryTracker> >;
   virtual ~MockMemoryTracker();
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_MOCKS_H_