Add a content API to connect a Native Client module to an out-of-process PPAPI proxy.

webkit/plugins/ppapi/plugin_module.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 "webkit/plugins/ppapi/plugin_module.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 493 matching lines @@
   // Create a new module, but don't set the lifetime delegate. This isn't a
   // plugin in the usual sense, so it isn't tracked by the browser.
   scoped_refptr<PluginModule> nacl_module(
       new PluginModule(name_,
                        path_,
                        NULL,  // no lifetime_delegate
                        permissions_));
   return nacl_module;
 }
 
-void PluginModule::InitAsProxiedNaCl(
-    scoped_ptr<PluginDelegate::OutOfProcessProxy> out_of_process_proxy,
-    PP_Instance instance) {
-  InitAsProxied(out_of_process_proxy.release());
+void PluginModule::InitAsProxiedNaCl(PluginInstance* plugin_instance) {
+  DCHECK(out_of_process_proxy_.get());
   // InitAsProxied (for the trusted/out-of-process case) initializes only the
   // module, and one or more instances are added later. In this case, the
   // PluginInstance was already created as in-process, so we missed the proxy
   // AddInstance step and must do it now.
-  out_of_process_proxy_->AddInstance(instance);
+  out_of_process_proxy_->AddInstance(plugin_instance->pp_instance());
   // In NaCl, we need to tell the instance to reset itself as proxied. This will
   // clear cached interface pointers and send DidCreate (etc) to the plugin
   // side of the proxy.
-  PluginInstance* plugin_instance = host_globals->GetInstance(instance);
-  if (!plugin_instance)
-    return;
   plugin_instance->ResetAsProxied(this);
 }
 
 // static
 const PPB_Core* PluginModule::GetCore() {
   return &core_interface;
 }
 
 // static
 PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() {
@@ skipping 87 matching lines @@
   int retval = entry_points.initialize_module(pp_module(), &GetInterface);
   if (retval != 0) {
     LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
     return false;
   }
   return true;
 }
 
 }  // namespace ppapi
 }  // namespace webkit