NaCl-Chrome integration

chrome/renderer/render_process.cc

Index: chrome/renderer/render_process.cc
===================================================================
--- chrome/renderer/render_process.cc	(revision 26533)
+++ chrome/renderer/render_process.cc	(working copy)
@@ -30,7 +30,9 @@
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message_utils.h"
 #include "media/base/media.h"
+#include "native_client/src/trusted/plugin/nacl_entry_points.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
 //-----------------------------------------------------------------------------
 
@@ -80,6 +82,16 @@
     StatisticsRecorder::set_dump_on_exit(true);
   }
 
+  if (command_line.HasSwitch(switches::kInternalNaCl)) {
+    NPAPI::PluginEntryPoints entry_points = {
+#if !defined(OS_LINUX)
+        NaCl_NP_GetEntryPoints,
+#endif
+        NaCl_NP_Initialize,
+        NaCl_NP_Shutdown};
+    NPAPI::PluginList::UseInternalNaCl(&entry_points);
+  }
+
   FilePath module_path;
   initialized_media_library_ =
       PathService::Get(base::DIR_MODULE, &module_path) &&