6 files changed, 2 insertions, 27 deletions
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.cc b/ppapi/proxy/ppapi_command_buffer_proxy.cc
index 98c2353..04c4468 100644
--- a/ppapi/proxy/ppapi_command_buffer_proxy.cc
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.cc
@@ -60,8 +60,7 @@ void PpapiCommandBufferProxy::SetChannelErrorCallback(
 }
 
 bool PpapiCommandBufferProxy::Initialize() {
-  return Send(new PpapiHostMsg_PPBGraphics3D_InitCommandBuffer(
-      ppapi::API_ID_PPB_GRAPHICS_3D, resource_));
+  return true;
 }
 
 gpu::CommandBuffer::State PpapiCommandBufferProxy::GetState() {
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 14312dc..8d9abe6 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -843,8 +843,6 @@ IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBGraphics3D_Create,
                            ppapi::HostResource /* share_context */,
                            std::vector<int32_t> /* attrib_list */,
                            ppapi::HostResource /* result */)
-IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBGraphics3D_InitCommandBuffer,
-                           ppapi::HostResource /* context */)
 IPC_SYNC_MESSAGE_ROUTED2_0(PpapiHostMsg_PPBGraphics3D_SetGetBuffer,
                            ppapi::HostResource /* context */,
                            int32 /* transfer_buffer_id */)
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.cc b/ppapi/proxy/ppb_graphics_3d_proxy.cc
index ddacde6..9bb90e6 100644
--- a/ppapi/proxy/ppb_graphics_3d_proxy.cc
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.cc
@@ -206,17 +206,10 @@ bool Graphics3D::Init(gpu::gles2::GLES2Implementation* share_gles2) {
       new LockingCommandBuffer(command_buffer_.get()));
 
   ScopedNoLocking already_locked(this);
-  if (!command_buffer_->Initialize())
-    return false;
-
   return CreateGLES2Impl(kCommandBufferSize, kTransferBufferSize,
                          share_gles2);
 }
 
-PP_Bool Graphics3D::InitCommandBuffer() {
-  return PP_FALSE;
-}
-
 PP_Bool Graphics3D::SetGetBuffer(int32_t /* transfer_buffer_id */) {
   return PP_FALSE;
 }
@@ -351,8 +344,6 @@ bool PPB_Graphics3D_Proxy::OnMessageReceived(const IPC::Message& msg) {
 #if !defined(OS_NACL)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_Create,
                         OnMsgCreate)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_InitCommandBuffer,
-                        OnMsgInitCommandBuffer)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_SetGetBuffer,
                         OnMsgSetGetBuffer)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_GetState,
@@ -403,16 +394,6 @@ void PPB_Graphics3D_Proxy::OnMsgCreate(PP_Instance instance,
   }
 }
 
-void PPB_Graphics3D_Proxy::OnMsgInitCommandBuffer(
-    const HostResource& context) {
-  EnterHostFromHostResource<PPB_Graphics3D_API> enter(context);
-  if (enter.failed())
-    return;
-
-  if (!enter.object()->InitCommandBuffer())
-    return;
-}
-
 void PPB_Graphics3D_Proxy::OnMsgSetGetBuffer(
     const HostResource& context,
     int32 transfer_buffer_id) {
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.h b/ppapi/proxy/ppb_graphics_3d_proxy.h
index f07d2c4..06fb308 100644
--- a/ppapi/proxy/ppb_graphics_3d_proxy.h
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.h
@@ -33,7 +33,6 @@ class Graphics3D : public PPB_Graphics3D_Shared {
   bool Init(gpu::gles2::GLES2Implementation* share_gles2);
 
   // Graphics3DTrusted API. These are not implemented in the proxy.
-  virtual PP_Bool InitCommandBuffer() OVERRIDE;
   virtual PP_Bool SetGetBuffer(int32_t shm_id) OVERRIDE;
   virtual PP_Graphics3DTrustedState GetState() OVERRIDE;
   virtual PP_Bool Flush(int32_t put_offset) OVERRIDE;
@@ -84,7 +83,6 @@ class PPB_Graphics3D_Proxy : public InterfaceProxy {
                    HostResource share_context,
                    const std::vector<int32_t>& attribs,
                    HostResource* result);
-  void OnMsgInitCommandBuffer(const HostResource& context);
   void OnMsgSetGetBuffer(const HostResource& context,
                          int32 id);
   void OnMsgGetState(const HostResource& context,
diff --git a/ppapi/thunk/ppb_graphics_3d_api.h b/ppapi/thunk/ppb_graphics_3d_api.h
index dc53b13..e7b98d2 100644
--- a/ppapi/thunk/ppb_graphics_3d_api.h
+++ b/ppapi/thunk/ppb_graphics_3d_api.h
@@ -30,7 +30,6 @@ class PPAPI_THUNK_EXPORT PPB_Graphics3D_API {
   virtual int32_t GetAttribMaxValue(int32_t attribute, int32_t* value) = 0;
 
   // Graphics3DTrusted API.
-  virtual PP_Bool InitCommandBuffer() = 0;
   virtual PP_Bool SetGetBuffer(int32_t shm_id) = 0;
   virtual PP_Graphics3DTrustedState GetState() = 0;
   virtual int32_t CreateTransferBuffer(uint32_t size) = 0;
diff --git a/ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc b/ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc
index 48f6ed1..e3fe422 100644
--- a/ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc
+++ b/ppapi/thunk/ppb_graphics_3d_trusted_thunk.cc
@@ -34,7 +34,7 @@ PP_Bool InitCommandBuffer(PP_Resource context) {
   EnterGraphics3D enter(context, true);
   if (enter.failed())
     return PP_FALSE;
-  return enter.object()->InitCommandBuffer();
+  return PP_TRUE;
 }
 
 PP_Bool SetGetBuffer(PP_Resource context, int32_t transfer_buffer_id) {