Switch from using 'nacl_main' to 'main' entry point

ports/nacl-spawn/nacl_spawn_test.cc

Index: ports/nacl-spawn/nacl_spawn_test.cc
diff --git a/ports/nacl-spawn/nacl_spawn_test.cc b/ports/nacl-spawn/nacl_spawn_test.cc
index 4e18707df30a548779b1f2c9c7f10285ad85cc49..32c8df54d487f73ab38dd8cae2fccca87b1ec0a4 100644
--- a/ports/nacl-spawn/nacl_spawn_test.cc
+++ b/ports/nacl-spawn/nacl_spawn_test.cc
@@ -4,8 +4,6 @@
 
 #include "gtest/gtest.h"
 
-#include "nacl_main.h"
-
 // These unittests should be run in the sel_ldr.  In this mode
 // nacl_io should not be initialized since we want direct access
 // to the real filesystem.  Verify this by checking the value
@@ -16,7 +14,13 @@ TEST(NaClSpawn, test_nacl_io_not_initialized) {
   ASSERT_NE((char*)NULL, strstr(cwd, "out/build/nacl-spawn"));
 }
 
-int nacl_main(int argc, char** argv) {
+extern bool _cli_main_init;
+
+TEST(NaClSpawn, test_cli_main_called) {
+  ASSERT_EQ(true, _cli_main_init);
+}
+
+int main(int argc, char** argv) {
   setenv("TERM", "xterm-256color", 0);
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();