Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9566)

Unified Diff: chrome/nacl/nacl_main.cc

Issue 6995121: New NaCl zygote implementation 2 (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Use IPC::Channel directly instead of ChildProcess Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/nacl/nacl_main.cc
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc
index 64adb2ccb12a099351a4b2ca78fe7c0b40222fe9..92ce3c4eead1a7b6caff6d6880e89cd1092e9af8 100644
--- a/chrome/nacl/nacl_main.cc
+++ b/chrome/nacl/nacl_main.cc
@@ -15,7 +15,7 @@
#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"
@@ -117,9 +117,10 @@ int NaClMain(const MainFunctionParams& parameters) {
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,

Powered by Google App Engine
This is Rietveld 408576698