PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally

ppapi/proxy/ppb_audio_input_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_audio_input_proxy.h"
 
 #include "base/compiler_specific.h"
 #include "ppapi/c/dev/ppb_audio_input_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_audio_config.h"
@@ skipping 268 matching lines @@
   EnterPluginFromHostResource<PPB_AudioInput_API> enter(audio_input);
   if (enter.succeeded()) {
     static_cast<AudioInput*>(enter.object())->OnEnumerateDevicesComplete(
         result, devices);
   }
 }
 
 void PPB_AudioInput_Proxy::OnMsgOpenACK(
     const HostResource& audio_input,
     int32_t result,
-    IPC::PlatformFileForTransit socket_handle,
-    base::SharedMemoryHandle handle,
-    uint32_t length) {
+    const ppapi::proxy::SerializedHandle& socket_handle,
+    const ppapi::proxy::SerializedHandle& handle) {
+  CHECK(socket_handle.is_socket());
+  CHECK(handle.is_shmem());
   EnterPluginFromHostResource<PPB_AudioInput_API> enter(audio_input);
   if (enter.failed()) {
     // The caller may still have given us these handles in the failure case.
     // The easiest way to clean these up is to just put them in the objects
     // and then close them. This failure case is not performance critical.
     base::SyncSocket temp_socket(
-        IPC::PlatformFileForTransitToPlatformFile(socket_handle));
-    base::SharedMemory temp_mem(handle, false);
+        IPC::PlatformFileForTransitToPlatformFile(
+            socket_handle.descriptor()));
+    base::SharedMemory temp_mem(handle.shmem(), false);
   } else {
     static_cast<AudioInput*>(enter.object())->OnOpenComplete(
-        result, handle, length,
-        IPC::PlatformFileForTransitToPlatformFile(socket_handle));
+        result, handle.shmem(), handle.size(),
+        IPC::PlatformFileForTransitToPlatformFile(socket_handle.descriptor()));
   }
 }
 
 void PPB_AudioInput_Proxy::EnumerateDevicesACKInHost(
     int32_t result,
     const HostResource& audio_input) {
   EnterHostFromHostResource<PPB_AudioInput_API> enter(audio_input);
   dispatcher()->Send(new PpapiMsg_PPBAudioInput_EnumerateDevicesACK(
       API_ID_PPB_AUDIO_INPUT_DEV, audio_input, result,
       enter.succeeded() && result == PP_OK ?
           enter.object()->GetDeviceRefData() : std::vector<DeviceRefData>()));
 }
 
 void PPB_AudioInput_Proxy::OpenACKInHost(int32_t result,
                                          const HostResource& audio_input) {
-  IPC::PlatformFileForTransit socket_handle =
-      IPC::InvalidPlatformFileForTransit();
-  base::SharedMemoryHandle shared_memory = IPC::InvalidPlatformFileForTransit();
-  uint32_t shared_memory_length = 0;
+  ppapi::proxy::SerializedHandle socket_handle(
+      ppapi::proxy::SerializedHandle::SOCKET);
+  ppapi::proxy::SerializedHandle shared_memory(
+      ppapi::proxy::SerializedHandle::SHARED_MEMORY);
 
   if (result == PP_OK) {
-    result = GetAudioInputConnectedHandles(audio_input, &socket_handle,
-                                           &shared_memory,
-                                           &shared_memory_length);
+    IPC::PlatformFileForTransit temp_socket;
+    base::SharedMemoryHandle temp_shmem;
+    uint32_t temp_size;
+    result = GetAudioInputConnectedHandles(audio_input, &temp_socket,
+                                           &temp_shmem, &temp_size);
+    if (result == PP_OK) {
+      socket_handle.set_socket(temp_socket);
+      shared_memory.set_shmem(temp_shmem, temp_size);
+    }
   }
 
   // Send all the values, even on error. This simplifies some of our cleanup
   // code since the handles will be in the other process and could be
   // inconvenient to clean up. Our IPC code will automatically handle this for
   // us, as long as the remote side always closes the handles it receives
   // (in OnMsgOpenACK), even in the failure case.
   dispatcher()->Send(new PpapiMsg_PPBAudioInput_OpenACK(
       API_ID_PPB_AUDIO_INPUT_DEV, audio_input, result, socket_handle,
-      shared_memory, shared_memory_length));
+      shared_memory));
 }
 
 int32_t PPB_AudioInput_Proxy::GetAudioInputConnectedHandles(
     const HostResource& resource,
     IPC::PlatformFileForTransit* foreign_socket_handle,
     base::SharedMemoryHandle* foreign_shared_memory_handle,
     uint32_t* shared_memory_length) {
   // Get the audio interface which will give us the handles.
   EnterHostFromHostResource<PPB_AudioInput_API> enter(resource);
   if (enter.failed())
@@ skipping 22 matching lines @@
   *foreign_shared_memory_handle = dispatcher()->ShareHandleWithRemote(
       IntToPlatformFile(shared_memory_handle), false);
   if (*foreign_shared_memory_handle == IPC::InvalidPlatformFileForTransit())
     return PP_ERROR_FAILED;
 
   return PP_OK;
 }
 
 }  // namespace proxy
 }  // namespace ppapi