PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally

ppapi/proxy/ppb_buffer_proxy.cc

 // Copyright (c) 2012 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 "ppapi/proxy/ppb_buffer_proxy.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "build/build_config.h"
@@ skipping 57 matching lines @@
 }
 
 // static
 PP_Resource PPB_Buffer_Proxy::CreateProxyResource(PP_Instance instance,
                                                   uint32_t size) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
 
   HostResource result;
-  base::SharedMemoryHandle shm_handle = base::SharedMemory::NULLHandle();
+  ppapi::proxy::SerializedHandle shm_handle;
   dispatcher->Send(new PpapiHostMsg_PPBBuffer_Create(
-      API_ID_PPB_BUFFER, instance, size,
-      &result, &shm_handle));
-  if (result.is_null() || !base::SharedMemory::IsHandleValid(shm_handle))
+      API_ID_PPB_BUFFER, instance, size, &result, &shm_handle));
+  if (result.is_null() || !shm_handle.IsHandleValid() ||
+      !shm_handle.is_shmem())
     return 0;
 
-  return AddProxyResource(result, shm_handle, size);
+  return AddProxyResource(result, shm_handle.shmem(), size);
 }
 
 // static
 PP_Resource PPB_Buffer_Proxy::AddProxyResource(
     const HostResource& resource,
     base::SharedMemoryHandle shm_handle,
     uint32_t size) {
   return (new Buffer(resource, shm_handle, size))->GetReference();
 }
 
 bool PPB_Buffer_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_Buffer_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBBuffer_Create, OnMsgCreate)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   // TODO(brettw) handle bad messages!
   return handled;
 }
 
 void PPB_Buffer_Proxy::OnMsgCreate(
     PP_Instance instance,
     uint32_t size,
     HostResource* result_resource,
-    base::SharedMemoryHandle* result_shm_handle) {
+    ppapi::proxy::SerializedHandle* result_shm_handle) {
   // Overwritten below on success.
-  *result_shm_handle = base::SharedMemory::NULLHandle();
+  result_shm_handle->set_null_shmem();
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return;
 
   thunk::EnterResourceCreation enter(instance);
   if (enter.failed())
     return;
   PP_Resource local_buffer_resource = enter.functions()->CreateBuffer(instance,
                                                                       size);
   if (local_buffer_resource == 0)
@@ skipping 12 matching lines @@
   // TODO(piman/brettw): Change trusted interface to return a PP_FileHandle,
   // those casts are ugly.
   base::PlatformFile platform_file =
 #if defined(OS_WIN)
       reinterpret_cast<HANDLE>(static_cast<intptr_t>(local_fd));
 #elif defined(OS_POSIX)
       local_fd;
 #else
   #error Not implemented.
 #endif
-  *result_shm_handle = dispatcher->ShareHandleWithRemote(platform_file, false);
+  result_shm_handle->set_shmem(
+      dispatcher->ShareHandleWithRemote(platform_file, false), size);
 }
 
 }  // namespace proxy
 }  // namespace ppapi