Revert 53333 - 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

TBR=mseaborn@chromium.org
Review URL: http://codereview.chromium.org/2832071

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

1 files changed, 2 insertions, 5 deletions

diff --git a/chrome/nacl/nacl_thread.cc b/chrome/nacl/nacl_thread.cc
index 33c0195..0f05f06 100644
--- a/chrome/nacl/nacl_thread.cc
+++ b/chrome/nacl/nacl_thread.cc
@@ -16,9 +16,7 @@ typedef HANDLE NaClHandle;
 typedef int NaClHandle;
 #endif  // NaClHandle
 
-// 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);
+int SelMain(const int desc, const NaClHandle handle);
 
 NaClThread::NaClThread() {
 }
@@ -38,6 +36,5 @@ void NaClThread::OnControlMessageReceived(const IPC::Message& msg) {
 
 void NaClThread::OnStartSelLdr(int channel_descriptor,
                                nacl::FileDescriptor handle) {
-  NaClHandle nacl_handle = nacl::ToNativeHandle(handle);
-  NaClMainForChromium(/* handle_count= */ 1, &nacl_handle);
+  SelMain(channel_descriptor, nacl::ToNativeHandle(handle));
 }