Changes the code to use separate ids namspaces...

gpu/command_buffer/client/gles2_implementation_unittest.cc

 // Copyright (c) 2009 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.
 
 // Tests for the Command Buffer Helper.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 627 matching lines @@
   EXPECT_CALL(*command_buffer_, OnFlush(_))
       .WillOnce(SetMemory(GLuint(GL_NO_ERROR)))
       .RetiresOnSaturation();
 
   gl_->BindBuffer(
       GL_ARRAY_BUFFER,
       GLES2Implementation::kClientSideArrayId);
   gl_->BindBuffer(
       GL_ARRAY_BUFFER,
       GLES2Implementation::kClientSideElementArrayId);
-  gl_->BindFramebuffer(
-      GL_FRAMEBUFFER,
-      GLES2Implementation::kClientSideArrayId);
-  gl_->BindFramebuffer(
-      GL_FRAMEBUFFER,
-      GLES2Implementation::kClientSideElementArrayId);
-  gl_->BindRenderbuffer(
-      GL_RENDERBUFFER,
-      GLES2Implementation::kClientSideArrayId);
-  gl_->BindRenderbuffer(
-      GL_RENDERBUFFER,
-      GLES2Implementation::kClientSideElementArrayId);
-  gl_->BindTexture(
-      GL_TEXTURE_2D,
-      GLES2Implementation::kClientSideArrayId);
-  gl_->BindTexture(
-      GL_TEXTURE_2D,
-      GLES2Implementation::kClientSideElementArrayId);
   GLenum err = gl_->GetError();
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), err);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
 
 #endif  // defined(GLES2_SUPPORT_CLIENT_SIDE_BUFFERS)
 
 
 }  // namespace gles2
 }  // namespace gpu