Changes the code to use separate ids namspaces...

gpu/command_buffer/service/texture_manager_unittest.cc

 // Copyright (c) 2010 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/texture_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
 namespace gles2 {
 
@@ skipping 20 matching lines @@
 
 // GCC requires these declarations, but MSVC requires they not be present
 #ifndef COMPILER_MSVC
 const GLint TextureManagerTest::kMaxTextureSize;
 const GLint TextureManagerTest::kMaxCubeMapTextureSize;
 const GLint TextureManagerTest::kMax2dLevels;
 const GLint TextureManagerTest::kMaxCubeMapLevels;
 #endif
 
 TEST_F(TextureManagerTest, Basic) {
-  const GLuint kTexture1Id = 1;
-  const GLuint kTexture2Id = 2;
+  const GLuint kClient1Id = 1;
+  const GLuint kService1Id = 11;
+  const GLuint kClient2Id = 2;
   // Check we can create texture.
-  manager_.CreateTextureInfo(kTexture1Id);
+  manager_.CreateTextureInfo(kClient1Id, kService1Id);
   // Check texture got created.
-  TextureManager::TextureInfo* info1 = manager_.GetTextureInfo(kTexture1Id);
+  TextureManager::TextureInfo* info1 = manager_.GetTextureInfo(kClient1Id);
   ASSERT_TRUE(info1 != NULL);
+  EXPECT_EQ(kService1Id, info1->service_id());
   // Check we get nothing for a non-existent texture.
-  EXPECT_TRUE(manager_.GetTextureInfo(kTexture2Id) == NULL);
+  EXPECT_TRUE(manager_.GetTextureInfo(kClient2Id) == NULL);
   // Check trying to a remove non-existent textures does not crash.
-  manager_.RemoveTextureInfo(kTexture2Id);
+  manager_.RemoveTextureInfo(kClient2Id);
   // Check we can't get the texture after we remove it.
-  manager_.RemoveTextureInfo(kTexture1Id);
-  EXPECT_TRUE(manager_.GetTextureInfo(kTexture1Id) == NULL);
+  manager_.RemoveTextureInfo(kClient1Id);
+  EXPECT_TRUE(manager_.GetTextureInfo(kClient1Id) == NULL);
 }
 
 TEST_F(TextureManagerTest, MaxValues) {
   // Check we get the right values for the max sizes.
   EXPECT_EQ(kMax2dLevels, manager_.MaxLevelsForTarget(GL_TEXTURE_2D));
   EXPECT_EQ(kMaxCubeMapLevels,
             manager_.MaxLevelsForTarget(GL_TEXTURE_CUBE_MAP));
   EXPECT_EQ(kMaxTextureSize, manager_.MaxSizeForTarget(GL_TEXTURE_2D));
   EXPECT_EQ(kMaxCubeMapTextureSize,
             manager_.MaxSizeForTarget(GL_TEXTURE_CUBE_MAP));
@@ skipping 42 matching lines @@
       GL_TEXTURE_CUBE_MAP, kMaxCubeMapLevels,
       kMaxCubeMapTextureSize, 1, 2));
 }
 
 class TextureInfoTest : public testing::Test {
  public:
   static const GLint kMaxTextureSize = 16;
   static const GLint kMaxCubeMapTextureSize = 8;
   static const GLint kMax2dLevels = 5;
   static const GLint kMaxCubeMapLevels = 4;
-  static const GLuint kTexture1Id = 1;
+  static const GLuint kClient1Id = 1;
+  static const GLuint kService1Id = 11;
 
   TextureInfoTest()
       : manager_(kMaxTextureSize, kMaxCubeMapTextureSize) {
   }
 
  protected:
   virtual void SetUp() {
-    manager_.CreateTextureInfo(kTexture1Id);
-    info_ = manager_.GetTextureInfo(kTexture1Id);
+    manager_.CreateTextureInfo(kClient1Id, kService1Id);
+    info_ = manager_.GetTextureInfo(kClient1Id);
     ASSERT_TRUE(info_ != NULL);
   }
 
   virtual void TearDown() {
   }
 
   TextureManager manager_;
   TextureManager::TextureInfo* info_;
 };
 
@@ skipping 151 matching lines @@
   GLsizei width = -1;
   GLsizei height = -1;
   EXPECT_FALSE(info_->GetLevelSize(GL_TEXTURE_2D, -1, &width, &height));
   EXPECT_FALSE(info_->GetLevelSize(GL_TEXTURE_2D, 1000, &width, &height));
   EXPECT_TRUE(info_->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height));
   EXPECT_EQ(0, width);
   EXPECT_EQ(0, height);
   EXPECT_TRUE(info_->GetLevelSize(GL_TEXTURE_2D, 1, &width, &height));
   EXPECT_EQ(4, width);
   EXPECT_EQ(5, height);
-  manager_.RemoveTextureInfo(info_->texture_id());
+  manager_.RemoveTextureInfo(kClient1Id);
   EXPECT_FALSE(info_->GetLevelSize(GL_TEXTURE_2D, 1, &width, &height));
 }
 
 }  // namespace gles2
 }  // namespace gpu