1 files changed, 4 insertions, 15 deletions
diff --git a/chrome/common/sandbox_init_wrapper_mac.cc b/chrome/common/sandbox_init_wrapper_mac.cc
index 3ed61ed..898faed 100644
--- a/chrome/common/sandbox_init_wrapper_mac.cc
+++ b/chrome/common/sandbox_init_wrapper_mac.cc
@@ -20,17 +20,8 @@ bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
     // Browser process isn't sandboxed.
     return true;
   } else if (process_type == switches::kRendererProcess) {
-    // Renderer process sandbox. If --internal_nacl is present then use the
-    // version of the renderer sandbox which allows Native Client to use Unix
-    // sockets.
-    // TODO(msneck): Remove the use of Unix sockets from Native Client and
-    // then get rid of the SANDBOX_TYPE_NACL_PLUGIN enum.
-    // See http://code.google.com/p/nativeclient/issues/detail?id=344
-    if (command_line.HasSwitch(switches::kInternalNaCl)) {
-      sandbox_process_type = sandbox::SANDBOX_TYPE_NACL_PLUGIN;
-    } else {
-      sandbox_process_type = sandbox::SANDBOX_TYPE_RENDERER;
-    }
+    // Renderer process sandbox.
+    sandbox_process_type = sandbox::SANDBOX_TYPE_RENDERER;
   } else if (process_type == switches::kExtensionProcess) {
     // Extension processes are just renderers [they use RenderMain()] with a
     // different set of command line flags.
@@ -48,10 +39,8 @@ bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
   } else if (process_type == switches::kWorkerProcess) {
     // Worker process sandbox.
     sandbox_process_type = sandbox::SANDBOX_TYPE_WORKER;
-  } else if (process_type == switches::kNaClLoaderProcess) {
-    // Native Client sel_ldr (user untrusted code) sandbox.
-    sandbox_process_type = sandbox::SANDBOX_TYPE_NACL_LOADER;
-  } else if ((process_type == switches::kPluginProcess) ||
+  } else if ((process_type == switches::kNaClLoaderProcess) ||
+             (process_type == switches::kPluginProcess) ||
              (process_type == switches::kProfileImportProcess) ||
              (process_type == switches::kGpuProcess)) {
     return true;