Revert 90805 - I am submitting this with LGTMs from agl@ and evanm@. I'm marking this as TBR=jam@...

chrome/nacl/nacl_main.cc

Index: chrome/nacl/nacl_main.cc
===================================================================
--- chrome/nacl/nacl_main.cc	(revision 90812)
+++ chrome/nacl/nacl_main.cc	(working copy)
@@ -15,15 +15,13 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
-#include "chrome/nacl/nacl_listener.h"
+#include "chrome/nacl/nacl_launcher_thread.h"
 #include "chrome/nacl/nacl_main_platform_delegate.h"
 #include "content/common/child_process.h"
-#include "content/common/child_process_info.h"
 #include "content/common/hi_res_timer_manager.h"
 #include "content/common/main_function_params.h"
 #include "content/common/result_codes.h"
 #include "content/common/sandbox_policy.h"
-#include "ipc/ipc_switches.h"
 
 #if defined(OS_WIN)
 #include "chrome/nacl/broker_thread.h"
@@ -119,8 +117,10 @@
   bool sandbox_test_result = platform.RunSandboxTests();
 
   if (sandbox_test_result) {
-    NaClListener listener;
-    listener.Listen();
+    ChildProcess nacl_process;
+    bool debug = parsed_command_line.HasSwitch(switches::kEnableNaClDebug);
+    nacl_process.set_main_thread(new NaClLauncherThread(debug));
+    MessageLoop::current()->Run();
   } else {
     // This indirectly prevents the test-harness-success-cookie from being set,
     // as a way of communicating test failure, because the nexe won't reply.
Property changes on: chrome/nacl/nacl_main.cc
___________________________________________________________________
Added: svn:mergeinfo