Changes the code to use separate ids namspaces...

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
 
 #include "app/gfx/gl/gl_context.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ skipping 107 matching lines @@
   T GetSharedMemoryAs() {
     return reinterpret_cast<T>(shared_memory_address_);
   }
 
   template <typename T>
   T GetSharedMemoryAsWithOffset(uint32 offset) {
     void* ptr = reinterpret_cast<int8*>(shared_memory_address_) + offset;
     return reinterpret_cast<T>(ptr);
   }
 
-  uint32 GetServiceId(uint32 client_id) {
-    return decoder_->GetServiceIdForTesting(client_id);
-  }
-
   BufferManager::BufferInfo* GetBufferInfo(GLuint service_id) {
     return group_.buffer_manager()->GetBufferInfo(service_id);
   }
 
   FramebufferManager::FramebufferInfo* GetFramebufferInfo(GLuint service_id) {
     return group_.framebuffer_manager()->GetFramebufferInfo(service_id);
   }
 
   RenderbufferManager::RenderbufferInfo* GetRenderbufferInfo(
       GLuint service_id) {
@@ skipping 194 matching lines @@
   void DeleteVertexBuffer();
 
   void DeleteIndexBuffer();
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_