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

content/renderer/pepper/pepper_plugin_delegate_impl.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 "content/renderer/pepper/pepper_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <cstddef>
 #include <map>
 #include <queue>
@@ skipping 365 matching lines @@
   // Out of process: have the browser start the plugin process for us.
   IPC::ChannelHandle channel_handle;
   int plugin_child_id = 0;
   render_view_->Send(new ViewHostMsg_OpenChannelToPepperPlugin(
       path, &channel_handle, &plugin_child_id));
   if (channel_handle.name.empty()) {
     // Couldn't be initialized.
     return scoped_refptr<webkit::ppapi::PluginModule>();
   }
 
-  scoped_refptr<PepperHungPluginFilter> hung_filter(
-      new PepperHungPluginFilter(path, render_view_->routing_id(),
-                                 plugin_child_id));
-
-  // Create a new HostDispatcher for the proxying, and hook it to a new
-  // PluginModule. Note that AddLiveModule must be called before any early
-  // returns since the module's destructor will remove itself.
+  // AddLiveModule must be called before any early returns since the
+  // module's destructor will remove itself.
   module = new webkit::ppapi::PluginModule(
       info->name, path,
       PepperPluginRegistry::GetInstance(),
       permissions);
   PepperPluginRegistry::GetInstance()->AddLiveModule(path, module);
-  scoped_ptr<HostDispatcherWrapper> dispatcher(
-      new HostDispatcherWrapper(module, plugin_child_id, permissions));
-  if (!dispatcher->Init(
-          channel_handle,
-          webkit::ppapi::PluginModule::GetLocalGetInterfaceFunc(),
-          GetPreferences(),
-          permissions,
-          hung_filter.get()))
+
+  if (!CreateOutOfProcessModule(
+           module, path, permissions, channel_handle, plugin_child_id)) {
     return scoped_refptr<webkit::ppapi::PluginModule>();
+  }
+  return module;
+}
 
-  RendererPpapiHostImpl* host_impl =
-      content::RendererPpapiHostImpl::CreateOnModuleForOutOfProcess(
-          module, dispatcher->dispatcher(), permissions);
-  render_view_->PpapiPluginCreated(host_impl);
-
-  module->InitAsProxied(dispatcher.release());
-  return module;
+RendererPpapiHost* PepperPluginDelegateImpl::CreateExternalPluginModule(
+    scoped_refptr<webkit::ppapi::PluginModule> module,
+    const FilePath& path,
+    ppapi::PpapiPermissions permissions,
+    const IPC::ChannelHandle& channel_handle,
+    int plugin_child_id) {
+  // We don't call PepperPluginRegistry::AddLiveModule, as this module is
+  // managed externally.
+  return CreateOutOfProcessModule(
+    module, path, permissions, channel_handle, plugin_child_id);
 }
 
 scoped_refptr<webkit::ppapi::PluginModule>
     PepperPluginDelegateImpl::CreateBrowserPluginModule(
         const IPC::ChannelHandle& channel_handle,
         int guest_process_id) {
   content::old::BrowserPluginRegistry* registry =
       RenderThreadImpl::current()->browser_plugin_registry();
   scoped_refptr<webkit::ppapi::PluginModule> module =
       registry->GetModule(guest_process_id);
@@ skipping 48 matching lines @@
                                                request_id,
                                                broker_path);
   if (!render_view_->Send(msg)) {
     pending_connect_broker_.Remove(request_id);
     return scoped_refptr<PepperBrokerImpl>();
   }
 
   return broker;
 }
 
+RendererPpapiHost* PepperPluginDelegateImpl::CreateOutOfProcessModule(
+    webkit::ppapi::PluginModule* module,
+    const FilePath& path,
+    ppapi::PpapiPermissions permissions,
+    const IPC::ChannelHandle& channel_handle,
+    int plugin_child_id) {
+  scoped_refptr<PepperHungPluginFilter> hung_filter(
+      new PepperHungPluginFilter(path,
+                                 render_view_->routing_id(),
+                                 plugin_child_id));
+  scoped_ptr<HostDispatcherWrapper> dispatcher(
+      new HostDispatcherWrapper(module, plugin_child_id, permissions));
+  if (!dispatcher->Init(
+          channel_handle,
+          webkit::ppapi::PluginModule::GetLocalGetInterfaceFunc(),
+          GetPreferences(),
+          permissions,
+          hung_filter.get()))
+    return NULL;
+
+  RendererPpapiHostImpl* host_impl =
+      content::RendererPpapiHostImpl::CreateOnModuleForOutOfProcess(
+          module, dispatcher->dispatcher(), permissions);
+  render_view_->PpapiPluginCreated(host_impl);
+
+  module->InitAsProxied(dispatcher.release());
+  return host_impl;
+}
+
 void PepperPluginDelegateImpl::OnMenuAction(int request_id, unsigned action) {
   // Just save the action.
   DCHECK(!has_saved_context_menu_action_);
   has_saved_context_menu_action_ = true;
   saved_context_menu_action_ = action;
 }
 
 void PepperPluginDelegateImpl::OnMenuClosed(int request_id) {
   PendingContextMenuMap::iterator found =
       pending_context_menus_.find(request_id);
@@ skipping 1367 matching lines @@
   else
     return render_view_->mouse_lock_dispatcher();
 }
 
 webkit_glue::ClipboardClient*
     PepperPluginDelegateImpl::CreateClipboardClient() const {
   return new RendererClipboardClient;
 }
 
 }  // namespace content