PPAPI/NaCl: Move handle extraction code to ppapi/proxy

chrome/nacl/nacl_ipc_adapter.h

 // 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.
 
 #ifndef CHROME_NACL_NACL_IPC_ADAPTER_H_
 #define CHROME_NACL_NACL_IPC_ADAPTER_H_
 
 #include <map>
 #include <queue>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/pickle.h"
 #include "base/shared_memory.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/task_runner.h"
 #include "ipc/ipc_listener.h"
+#include "ppapi/proxy/handle_converter.h"
 
 struct NaClDesc;
 struct NaClImcTypedMsgHdr;
 struct PP_Size;
 
 namespace IPC {
 class Channel;
 struct ChannelHandle;
 }
 
@@ skipping 89 matching lines @@
   // This is the data that must only be accessed inside the lock. This struct
   // just separates it so it's easier to see.
   struct LockedData {
     LockedData();
     ~LockedData();
 
     // Messages that we have read off of the Chrome IPC channel that are waiting
     // to be received by the plugin.
     std::queue< scoped_refptr<RewrittenMessage> > to_be_received_;
 
-    // When we send a synchronous message (from untrusted to trusted), we store
-    // its type here, so that later we can associate the reply with its type
-    // and potentially translate handles in the message.
-    typedef std::map<int, uint32> PendingSyncMsgMap;
-    PendingSyncMsgMap pending_sync_msgs_;
+    ppapi::proxy::HandleConverter handle_converter_;
 
     // Data that we've queued from the plugin to send, but doesn't consist of a
     // full message yet. The calling code can break apart the message into
     // smaller pieces, and we need to send the message to the other process in
     // one chunk.
     //
     // The IPC channel always starts a new send() at the beginning of each
     // message, so we don't need to worry about arbitrary message boundaries.
     std::string to_be_sent_;
 
@@ skipping 39 matching lines @@
   // To be accessed inside of lock_ only.
   LockedData locked_data_;
 
   // To be accessed on the I/O thread (via task runner) only.
   IOThreadData io_thread_data_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClIPCAdapter);
 };
 
 #endif  // CHROME_NACL_NACL_IPC_ADAPTER_H_