Pepper: Make pending_sync_msgs_ local to IO thread.

ppapi/proxy/nacl_message_scanner.h

 // Copyright 2013 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 PPAPI_PROXY_NACL_MESSAGE_SCANNER_H_
 #define PPAPI_PROXY_NACL_MESSAGE_SCANNER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 16 matching lines @@
  public:
   NaClMessageScanner();
   ~NaClMessageScanner();
 
   // Scans the message for items that require special handling. Copies any
   // SerializedHandles in the message into |handles| and if the message must be
   // rewritten for NaCl, sets |new_msg_ptr| to the new message. If no handles
   // are found, |handles| is left unchanged. If no rewriting is needed,
   // |new_msg_ptr| is left unchanged.
   //
+  // For normal messages, |type| is equivalent to |msg|.id(), but, if |msg| is
+  // a reply to a synchronous message, |type| is the id of the original
+  // message.
+  //
   // See more explanation in the method definition.
   //
   // See chrome/nacl/nacl_ipc_adapter.cc for where this is used to help convert
   // native handles to NaClDescs.
   bool ScanMessage(const IPC::Message& msg,
+                   uint32_t type,
                    std::vector<SerializedHandle>* handles,
                    scoped_ptr<IPC::Message>* new_msg_ptr);
 
   // Scans an untrusted message for items that require special handling. If the
   // message had to be rewritten, sets |new_msg_ptr| to the new message.
   void ScanUntrustedMessage(const IPC::Message& untrusted_msg,
                             scoped_ptr<IPC::Message>* new_msg_ptr);
 
   // FileSystem information for quota auditing.
   class PPAPI_PROXY_EXPORT FileSystem {
@@ skipping 40 matching lines @@
     // plugin writes to greater maximum offsets.
     int64_t max_written_offset_;
 
     DISALLOW_COPY_AND_ASSIGN(FileIO);
   };
 
   FileIO* GetFile(PP_Resource file_io);
 
  private:
   friend class NaClMessageScannerTest;
-
-  void RegisterSyncMessageForReply(const IPC::Message& msg);
   void AuditNestedMessage(PP_Resource resource,
                           const IPC::Message& msg,
                           SerializedHandle* handle);
 
-  // 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
-  // for scanning.
-  typedef std::map<int, uint32> PendingSyncMsgMap;
-  PendingSyncMsgMap pending_sync_msgs_;
-
   // We intercept FileSystem and FileIO messages to maintain information about
   // file systems and open files. This is used by NaClQuotaDescs to calculate
   // quota consumption and check it against the reserved amount.
   typedef std::map<int32_t, FileSystem*> FileSystemMap;
   FileSystemMap file_systems_;
   typedef std::map<int32_t, FileIO*> FileIOMap;
   FileIOMap files_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClMessageScanner);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_NACL_MESSAGE_SCANNER_H_