Add glBindUniformLocationCHROMIUM

gpu/command_buffer/client/gles2_implementation_unittest.cc

Index: gpu/command_buffer/client/gles2_implementation_unittest.cc
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc
index 9d404938ddf77916a675ab4ddd47c7a223280af2..b7f599b4aaac1edbe32e7f7b4ba335febba4637b 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest.cc
+++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc
@@ -2303,7 +2303,6 @@ TEST_F(GLES2ImplementationTest, GetString) {
       "foobar "
       "GL_CHROMIUM_map_sub "
       "GL_CHROMIUM_flipy "
-      "GL_CHROMIUM_consistent_uniform_locations "
       "GL_EXT_unpack_subimage";
   const char kBad = 0x12;
   struct Cmds {
@@ -2565,133 +2564,6 @@ TEST_F(GLES2ImplementationTest, BeginEndQueryEXT) {
   EXPECT_EQ(0u, available);
 }
 
-namespace {
-
-class MockProgramInfoManager : public ProgramInfoManager {
- public:
-  virtual ~MockProgramInfoManager() {};
-
-  MOCK_METHOD1(CreateInfo, void(GLuint program));
-
-  MOCK_METHOD1(DeleteInfo, void(GLuint program));
-
-  MOCK_METHOD4(GetProgramiv, bool(
-      GLES2Implementation* gl, GLuint program, GLenum pname, GLint* params));
-
-  MOCK_METHOD3(GetAttribLocation, GLint(
-      GLES2Implementation* gl, GLuint program, const char* name));
-
-  MOCK_METHOD3(GetUniformLocation, GLint(
-      GLES2Implementation* gl, GLuint program, const char* name));
-
-  MOCK_METHOD8(GetActiveAttrib, bool(
-      GLES2Implementation* gl,
-      GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
-      GLint* size, GLenum* type, char* name));
-
-  MOCK_METHOD8(GetActiveUniform, bool(
-      GLES2Implementation* gl,
-      GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
-      GLint* size, GLenum* type, char* name));
-};
-
-}  // anonymous namespace
-
-TEST_F(GLES2ImplementationTest, GetUniformLocationsCHROMIUM) {
-  MockProgramInfoManager* manager = new MockProgramInfoManager();
-  SetProgramInfoManager(manager);
-
-  const GLuint kProgramId = 123;
-  static const GLUniformDefinitionCHROMIUM good_defs[] = {
-    { GL_FLOAT_VEC4, 1, "moo", },
-    { GL_FLOAT_VEC4, 4, "bar", },
-    { GL_FLOAT_VEC4, 3, "foo", },
-  };
-
-  static const GLUniformDefinitionCHROMIUM bad_defs[] = {
-    { GL_FLOAT_VEC4, 1, "moo", },
-    { GL_FLOAT_VEC4, 0, "bar", },
-    { GL_FLOAT_VEC4, 3, "foo", },
-  };
-
-  // Test bad count
-  GLint locations[50] = { -1, };
-  gl_->GetUniformLocationsCHROMIUM(kProgramId, bad_defs, 0, 1, locations);
-  EXPECT_EQ(GL_INVALID_VALUE, CheckError());
-  EXPECT_EQ(-1, locations[0]);
-
-  // Test bad size.
-  gl_->GetUniformLocationsCHROMIUM(
-      kProgramId, bad_defs, arraysize(bad_defs), 1, locations);
-  EXPECT_EQ(GL_INVALID_VALUE, CheckError());
-  EXPECT_EQ(-1, locations[0]);
-
-  #if defined(GPU_CLIENT_DEBUG)
-  EXPECT_CALL(*manager, GetUniformLocation(_, kProgramId, _))
-      .WillOnce(Return(
-          GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(2, 0))))
-      .WillOnce(Return(
-          GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(0, 0))))
-      .WillOnce(Return(
-          GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(0, 1))))
-      .RetiresOnSaturation();
-  #endif
-
-  // Test max_locations
-  gl_->GetUniformLocationsCHROMIUM(
-      kProgramId, good_defs, arraysize(good_defs), 3, locations);
-  EXPECT_EQ(GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(2, 0)),
-            locations[0]);
-  EXPECT_EQ(GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(0, 0)),
-            locations[1]);
-  EXPECT_EQ(GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(0, 1)),
-            locations[2]);
-  EXPECT_EQ(0, locations[3]);
-
-  #if defined(GPU_CLIENT_DEBUG)
-  EXPECT_CALL(*manager, GetUniformLocation(_, kProgramId, _))
-      .WillOnce(Return(
-          GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(2, 0))))
-      .WillOnce(Return(
-          GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(0, 0))))
-      .WillOnce(Return(
-          GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(0, 1))))
-      .WillOnce(Return(
-          GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(0, 2))))
-      .WillOnce(Return(
-          GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(0, 3))))
-      .WillOnce(Return(
-          GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(1, 0))))
-      .WillOnce(Return(
-          GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(1, 1))))
-      .WillOnce(Return(
-          GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(1, 2))))
-      .RetiresOnSaturation();
-  #endif
-
-  // Test all.
-  gl_->GetUniformLocationsCHROMIUM(
-      kProgramId, good_defs, arraysize(good_defs), arraysize(locations),
-      locations);
-  EXPECT_EQ(GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(2, 0)),
-            locations[0]);
-  EXPECT_EQ(GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(0, 0)),
-            locations[1]);
-  EXPECT_EQ(GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(0, 1)),
-            locations[2]);
-  EXPECT_EQ(GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(0, 2)),
-            locations[3]);
-  EXPECT_EQ(GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(0, 3)),
-            locations[4]);
-  EXPECT_EQ(GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(1, 0)),
-            locations[5]);
-  EXPECT_EQ(GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(1, 1)),
-            locations[6]);
-  EXPECT_EQ(GLES2Util::SwizzleLocation(GLES2Util::MakeFakeLocation(1, 2)),
-            locations[7]);
-  EXPECT_EQ(0, locations[8]);
-}
-
 #include "gpu/command_buffer/client/gles2_implementation_unittest_autogen.h"
 
 }  // namespace gles2