Make NaCl/Chromium startup interface easier to maintain

Use the new NaClMainForChromium() from the NaCl tree, instead of
sel_main.cc in the Chromium tree.

Use the new variant of RegisterInternalNaClPlugin() that can receive
multiple functions instead of just one.

This depends on r2744 from NaCl.

BUG=http://code.google.com/p/nativeclient/issues/detail?id=642
BUG=http://code.google.com/p/nativeclient/issues/detail?id=469
TEST=Chromium's nacl_ui_tests

Review URL: http://codereview.chromium.org/3039016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53333 0039d316-1c4b-4281-b951-d872f2087c98

chrome/nacl.gypi

@@ -30,7 +30,6 @@
           'nacl/nacl_main_platform_delegate_win.cc',
           'nacl/nacl_thread.cc',
           'nacl/nacl_thread.h',
-          'nacl/sel_main.cc',
         ],
         # TODO(gregoryd): consider switching NaCl to use Chrome OS defines
         'conditions': [

chrome/nacl/nacl_thread.cc

@@ -16,7 +16,9 @@ typedef HANDLE NaClHandle;
 typedef int NaClHandle;
 #endif  // NaClHandle
 
-int SelMain(const int desc, const NaClHandle handle);
+// This is currently necessary because we have a conflict between
+// NaCl's "struct NaClThread" and Chromium's "class NaClThread".
+extern "C" int NaClMainForChromium(int handle_count, const NaClHandle* handles);
 
 NaClThread::NaClThread() {
 }
@@ -36,5 +38,6 @@ void NaClThread::OnControlMessageReceived(const IPC::Message& msg) {
 
 void NaClThread::OnStartSelLdr(int channel_descriptor,
                                nacl::FileDescriptor handle) {
-  SelMain(channel_descriptor, nacl::ToNativeHandle(handle));
+  NaClHandle nacl_handle = nacl::ToNativeHandle(handle);
+  NaClMainForChromium(/* handle_count= */ 1, &nacl_handle);
 }

chrome/renderer/render_process_impl.cc

@@ -154,8 +154,12 @@ RenderProcessImpl::RenderProcessImpl()
   }
 
 #ifndef DISABLE_NACL
-  if (command_line.HasSwitch(switches::kInternalNaCl))
-    RegisterInternalNaClPlugin(LaunchNaClProcess);
+  if (command_line.HasSwitch(switches::kInternalNaCl)) {
+    std::map<std::string, uintptr_t> funcs;
+    funcs["launch_nacl_process"] =
+      reinterpret_cast<uintptr_t>(LaunchNaClProcess);
+    RegisterInternalNaClPlugin(funcs);
+  }
 #endif
 
   if (!command_line.HasSwitch(switches::kDisableByteRangeSupport)) {