Changes the code to use separate ids namspaces...

gpu/command_buffer/service/gles2_cmd_decoder.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.
 
 // This file contains the GLES2Decoder class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 
 #include "base/callback.h"
@@ skipping 49 matching lines @@
 
   // Destroys the graphics context.
   virtual void Destroy() = 0;
 
   // Resize an offscreen frame buffer.
   virtual void ResizeOffscreenFrameBuffer(const gfx::Size& size) = 0;
 
   // Make this decoder's GL context current.
   virtual bool MakeCurrent() = 0;
 
-  // Gets a service id by client id.
-  virtual uint32 GetServiceIdForTesting(uint32 client_id) = 0;
-
   // Gets the GLES2 Util which holds info.
   virtual GLES2Util* GetGLES2Util() = 0;
 
   // Gets the associated GLContext.
   virtual gfx::GLContext* GetGLContext() = 0;
 
   // Sets a callback which is called when a SwapBuffers command is processed.
   virtual void SetSwapBuffersCallback(Callback0::Type* callback) = 0;
 
  protected:
   explicit GLES2Decoder(ContextGroup* group);
 
   ContextGroup* group_;
 
  private:
   bool debug_;
 
   DISALLOW_COPY_AND_ASSIGN(GLES2Decoder);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_