Part 2 of Make NaCl/Chromium startup interface easier to maintain

chrome/nacl/nacl_thread.cc

Index: chrome/nacl/nacl_thread.cc
diff --git a/chrome/nacl/nacl_thread.cc b/chrome/nacl/nacl_thread.cc
index 0f05f0682c1c7e0756edcc1ec6dbd05e878d699f..33c01954d7c7703853a80d00fe3cb86a8bb3b552 100644
--- a/chrome/nacl/nacl_thread.cc
+++ b/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);
 }