Allow the NaCl IPC proxy to support multiple instances.

webkit/plugins/ppapi/plugin_module.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 WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
 #define WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 87 matching lines @@
   bool InitAsInternalPlugin(const EntryPoints& entry_points);
 
   // Initializes this module using the given library path as the plugin.
   // Returns true on success. False means that the plugin can not be used.
   bool InitAsLibrary(const FilePath& path);
 
   // Initializes this module for the given out of process proxy. This takes
   // ownership of the given pointer, even in the failure case.
   void InitAsProxied(PluginDelegate::OutOfProcessProxy* out_of_process_proxy);
 
-  // Initializes this module for the given NaCl proxy. This takes
+  // Creates a new module for a NaCl instance that will be using the IPC proxy.
+  // We can't use the existing module, or new instances of the plugin can't
+  // be created.
+  scoped_refptr<PluginModule> CreateModuleForNaClInstance();
+
+  // Initializes the NaCl module for the given out of process proxy. This takes
   // ownership of the given pointer, even in the failure case.
   void InitAsProxiedNaCl(
       scoped_ptr<PluginDelegate::OutOfProcessProxy> out_of_process_proxy,
       PP_Instance instance);
 
   static const PPB_Core* GetCore();
 
   // Returns a pointer to the local GetInterface function for retrieving
   // PPB interfaces.
   static GetInterfaceFunc GetLocalGetInterfaceFunc();
@@ skipping 108 matching lines @@
   const FilePath path_;
 
   ::ppapi::PpapiPermissions permissions_;
 
   // Non-owning pointers to all instances associated with this module. When
   // there are no more instances, this object should be deleted.
   PluginInstanceSet instances_;
 
   PP_Bool (*reserve_instance_id_)(PP_Module, PP_Instance);
 
-  bool nacl_ipc_proxy_;
-
   DISALLOW_COPY_AND_ASSIGN(PluginModule);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_