Remove NameMap from shader translator and shader/program managers

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 81 matching lines @@
  public:
   MockShaderTranslator();
 
   MOCK_METHOD6(Init,
                bool(sh::GLenum shader_type,
                     ShShaderSpec shader_spec,
                     const ShBuiltInResources* resources,
                     ShShaderOutput shader_output_language,
                     ShCompileOptions driver_bug_workarounds,
                     bool gl_shader_interm_output));
-  MOCK_CONST_METHOD10(Translate,
-                      bool(const std::string& shader_source,
-                           std::string* info_log,
-                           std::string* translated_source,
-                           int* shader_version,
-                           AttributeMap* attrib_map,
-                           UniformMap* uniform_map,
-                           VaryingMap* varying_map,
-                           InterfaceBlockMap* interface_block_map,
-                           OutputVariableList* output_variable_list,
-                           NameMap* name_map));
+  MOCK_CONST_METHOD9(Translate,
+                     bool(const std::string& shader_source,
+                          std::string* info_log,
+                          std::string* translated_source,
+                          int* shader_version,
+                          AttributeMap* attrib_map,
+                          UniformMap* uniform_map,
+                          VaryingMap* varying_map,
+                          InterfaceBlockMap* interface_block_map,
+                          OutputVariableList* output_variable_list));
   MOCK_CONST_METHOD0(
       GetStringForOptionsThatWouldAffectCompilation, std::string());
  private:
   ~MockShaderTranslator() override;
 };
 
 class MockProgramCache : public ProgramCache {
  public:
   MockProgramCache();
   virtual ~MockProgramCache();
@@ skipping 35 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_