Remove NameMap from shader translator and shader/program managers

gpu/command_buffer/service/memory_program_cache_unittest.cc

 // 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.
 
 #include "gpu/command_buffer/service/memory_program_cache.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 125 matching lines @@
         GL_FLOAT_VEC4, 2, GL_HIGH_FLOAT, true, "c");
     fragment_output_variable_list.push_back(TestHelper::ConstructOutputVariable(
         GL_FLOAT, 0, GL_HIGH_FLOAT, true, "d"));
 
     vertex_shader_->set_source("bbbalsldkdkdkd");
     fragment_shader_->set_source("bbbal   sldkdkdkas 134 ad");
 
     TestHelper::SetShaderStates(gl_.get(), vertex_shader_, true, nullptr,
                                 nullptr, nullptr, &vertex_attrib_map,
                                 &vertex_uniform_map, &vertex_varying_map,
-                                nullptr, &vertex_output_variable_list, nullptr);
-    TestHelper::SetShaderStates(
-        gl_.get(), fragment_shader_, true, nullptr, nullptr, nullptr,
-        &fragment_attrib_map, &fragment_uniform_map, &fragment_varying_map,
-        nullptr, &fragment_output_variable_list, nullptr);
+                                nullptr, &vertex_output_variable_list);
+    TestHelper::SetShaderStates(gl_.get(), fragment_shader_, true, nullptr,
+                                nullptr, nullptr, &fragment_attrib_map,
+                                &fragment_uniform_map, &fragment_varying_map,
+                                nullptr, &fragment_output_variable_list);
   }
 
   void SetExpectationsForSaveLinkedProgram(
       const GLint program_id,
       ProgramBinaryEmulator* emulator) const {
     EXPECT_CALL(*gl_.get(),
                 GetProgramiv(program_id, GL_PROGRAM_BINARY_LENGTH_OES, _))
         .WillOnce(SetArgPointee<2>(emulator->length()));
     EXPECT_CALL(*gl_.get(),
                 GetProgramBinary(program_id, emulator->length(), _, _, _))
@@ skipping 563 matching lines @@
       fragment_shader_,
       NULL,
       varyings_,
       GL_NONE,
       base::Bind(&MemoryProgramCacheTest::ShaderCacheCb,
                  base::Unretained(this))));
 }
 
 }  // namespace gles2
 }  // namespace gpu