summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_dll_main.cc
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-13 18:10:48 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-13 18:10:48 +0000
commite5368488e2fdad1cf27d6c0fd1031769affbaa5e (patch)
treeeba0c62eef2a9d4065955d7f612bdc3839387e91 /chrome/app/chrome_dll_main.cc
parent304b0e350dbadef7d1d418fcd17ef42c922612ca (diff)
downloadchromium_src-e5368488e2fdad1cf27d6c0fd1031769affbaa5e.zip
chromium_src-e5368488e2fdad1cf27d6c0fd1031769affbaa5e.tar.gz
chromium_src-e5368488e2fdad1cf27d6c0fd1031769affbaa5e.tar.bz2
Run worker processes via the zygote.
The following tests fail when using the SUID sandbox because they try to count processes and the extra sandbox processes throw them off. They pass with this patch so long as the SUID sandbox isn't invoked (which is the case on the builders): WorkerTest.FLAKY_MultipleTabsQueuedSharedWorker WorkerTest.FLAKY_LimitPerPage WorkerTest.WorkerClose WorkerTest.QueuedSharedWorkerShutdown WorkerTest.FLAKY_QueuedSharedWorkerStartedFromOtherTab Note that this patch doesn't trigger the seccomp sandbox for worker processes. That will have to wait for another CL. BUG=54794 TEST=ui_tests http://codereview.chromium.org/3312021/show git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
-rw-r--r--chrome/app/chrome_dll_main.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 02f554d..99e5a6a 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -854,12 +854,14 @@ int ChromeMain(int argc, char** argv) {
if (process_type == switches::kRendererProcess ||
process_type == switches::kExtensionProcess) {
rv = RendererMain(main_params);
-#ifndef DISABLE_NACL
+#if !defined(DISABLE_NACL)
} else if (process_type == switches::kNaClLoaderProcess) {
rv = NaClMain(main_params);
#endif
+ } else if (process_type == switches::kWorkerProcess) {
+ rv = WorkerMain(main_params);
} else {
- NOTREACHED() << "Unknown process type";
+ NOTREACHED() << "Unknown process type: " << process_type;
}
} else {
rv = 0;