New NaCl zygote implementation 2

chrome/nacl/nacl_main.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/system_monitor/system_monitor.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
-#include "chrome/nacl/nacl_launcher_thread.h"
+#include "chrome/nacl/nacl_listener.h"
 #include "chrome/nacl/nacl_main_platform_delegate.h"
 #include "content/common/child_process.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"
 
 #if defined(OS_WIN)
 #include "chrome/nacl/broker_thread.h"
 #include "sandbox/src/sandbox.h"
@@ skipping 81 matching lines @@
   platform.PlatformInitialize();
   bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);
   platform.InitSandboxTests(no_sandbox);
 
   if (!no_sandbox) {
     platform.EnableSandbox();
   }
   bool sandbox_test_result = platform.RunSandboxTests();
 
   if (sandbox_test_result) {
-    ChildProcess nacl_process;
-    bool debug = parsed_command_line.HasSwitch(switches::kEnableNaClDebug);
-    nacl_process.set_main_thread(new NaClLauncherThread(debug));
+    NaClListener listener;
+    IPC::Channel chan(kNaClListenerHandle,

[jam, 2011/06/21 20:54:08]

nit: channel not chan per style guide

[Brad Chen, 2011/06/21 23:43:48]

Done.

+                      IPC::Channel::MODE_CLIENT, &listener);
+    CHECK(chan.Connect());
     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.
     // TODO(jvoung): find a better way to indicate failure that doesn't
     // require waiting for a timeout.
     VLOG(1) << "Sandbox test failed: Not launching NaCl process";
   }
 #else
   NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";
 #endif
 
   platform.PlatformUninitialize();
   return 0;
 }