Remove NameMap from shader translator and shader/program managers

gpu/command_buffer/service/memory_program_cache_unittest.cc

Index: gpu/command_buffer/service/memory_program_cache_unittest.cc
diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc
index 61726ed969b87ace34f9af2e1383d1e044d73f0f..6cad7e3e23574fa6c14d793bff640afc6a20c273 100644
--- a/gpu/command_buffer/service/memory_program_cache_unittest.cc
+++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc
@@ -143,11 +143,11 @@ class MemoryProgramCacheTest : public GpuServiceTest {
     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(