Hook up shader long variable name mapping with GPU command buffer port.

gpu/command_buffer/service/shader_manager_unittest.cc

 // Copyright (c) 2011 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/shader_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/service/mocks.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 124 matching lines @@
   const char* kAttrib2Name = "attr2";
   const GLenum kUniform1Type = GL_FLOAT_MAT2;
   const GLsizei kUniform1Size = 3;
   const char* kUniform1Name = "uni1";
   const GLenum kUniform2Type = GL_FLOAT_MAT3;
   const GLsizei kUniform2Size = 5;
   const char* kUniform2Name = "uni2";
   MockShaderTranslator shader_translator;
   ShaderTranslator::VariableMap attrib_map;
   attrib_map[kAttrib1Name] = ShaderTranslatorInterface::VariableInfo(
-      kAttrib1Type, kAttrib1Size);
+      kAttrib1Type, kAttrib1Size, kAttrib1Name);
   attrib_map[kAttrib2Name] = ShaderTranslatorInterface::VariableInfo(
-      kAttrib2Type, kAttrib2Size);
+      kAttrib2Type, kAttrib2Size, kAttrib2Name);
   ShaderTranslator::VariableMap uniform_map;
   uniform_map[kUniform1Name] = ShaderTranslatorInterface::VariableInfo(
-      kUniform1Type, kUniform1Size);
+      kUniform1Type, kUniform1Size, kUniform1Name);
   uniform_map[kUniform2Name] = ShaderTranslatorInterface::VariableInfo(
-      kUniform2Type, kUniform2Size);
+      kUniform2Type, kUniform2Size, kUniform2Name);
   EXPECT_CALL(shader_translator, attrib_map())
       .WillRepeatedly(ReturnRef(attrib_map));
   EXPECT_CALL(shader_translator, uniform_map())
       .WillRepeatedly(ReturnRef(uniform_map));
   // Check we can create shader.
   ShaderManager::ShaderInfo* info1 = manager_.CreateShaderInfo(
       kClient1Id, kService1Id, kShader1Type);
   // Check shader got created.
   ASSERT_TRUE(info1 != NULL);
   // Set Status
   info1->SetStatus(true, "", &shader_translator);
   // Check attrib and uniform infos got copied.
   for (ShaderTranslator::VariableMap::const_iterator it = attrib_map.begin();
        it != attrib_map.end(); ++it) {
     const ShaderManager::ShaderInfo::VariableInfo* variable_info =
         info1->GetAttribInfo(it->first);
     ASSERT_TRUE(variable_info != NULL);
     EXPECT_EQ(it->second.type, variable_info->type);
     EXPECT_EQ(it->second.size, variable_info->size);
+    EXPECT_EQ(it->second.name, variable_info->name);
   }
   for (ShaderTranslator::VariableMap::const_iterator it = uniform_map.begin();
        it != uniform_map.end(); ++it) {
     const ShaderManager::ShaderInfo::VariableInfo* variable_info =
         info1->GetUniformInfo(it->first);
     ASSERT_TRUE(variable_info != NULL);
     EXPECT_EQ(it->second.type, variable_info->type);
     EXPECT_EQ(it->second.size, variable_info->size);
+    EXPECT_EQ(it->second.name, variable_info->name);
   }
   // Check attrib and uniform get cleared.
   info1->SetStatus(true, NULL, NULL);
   EXPECT_TRUE(info1->log_info() == NULL);
   for (ShaderTranslator::VariableMap::const_iterator it = attrib_map.begin();
        it != attrib_map.end(); ++it) {
     const ShaderManager::ShaderInfo::VariableInfo* variable_info =
         info1->GetAttribInfo(it->first);
     EXPECT_TRUE(variable_info == NULL);
   }
@@ skipping 45 matching lines @@
   EXPECT_EQ(info1, info2);
   manager_.MarkAsDeleted(info1);  // this should delete the shader.
   info2 = manager_.GetShaderInfo(kClient1Id);
   EXPECT_TRUE(info2 == NULL);
 }
 
 }  // namespace gles2
 }  // namespace gpu