Move chrome/nacl to components/nacl.

chrome/app/chrome_main_delegate.cc

Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 06f8c17934d0d014f905fa368caa56dde298f76e..f459623aed245a572568d06ba292bfa0d66aeeb4 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -30,6 +30,7 @@
 #include "chrome/plugin/chrome_content_plugin_client.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome/utility/chrome_content_utility_client.h"
+#include "components/nacl/common/nacl_switches.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
 #include "ui/base/ui_base_switches.h"
@@ -62,9 +63,12 @@
 #include <signal.h>
 #endif
 
+#ifndef (DISABLE_NACL)

[jam, 2013/06/17 20:10:43]

nit: here and below, "#if !defined(DISABLE_NACL)". that's preferred over ifndef

 #if defined(OS_POSIX) && !defined(OS_MACOSX)
-#include "chrome/app/nacl_fork_delegate_linux.h"
+#include "components/nacl/common/nacl_fork_delegate_linux.h"
+#include "components/nacl/common/nacl_paths.h"
 #endif
+#endif // ifndef DISABLE_NACL
 
 #if defined(OS_CHROMEOS)
 #include "base/sys_info.h"
@@ -474,6 +478,11 @@ void ChromeMainDelegate::PreSandboxStartup() {
 #if defined(OS_CHROMEOS)
   chromeos::RegisterPathProvider();
 #endif
+#ifndef (DISABLE_NACL)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
+  nacl::RegisterPathProvider();
+#endif
+#endif // ifndef (DISABLE_NACL)
 
 #if defined(OS_MACOSX)
   // On the Mac, the child executable lives at a predefined location within
@@ -531,7 +540,9 @@ void ChromeMainDelegate::PreSandboxStartup() {
     DCHECK(command_line.HasSwitch(switches::kLang) ||
            process_type == switches::kZygoteProcess ||
            process_type == switches::kGpuProcess ||
+#ifndef (DISABLE_NACL)
            process_type == switches::kNaClLoaderProcess ||
+#endif
            process_type == switches::kPpapiBrokerProcess ||
            process_type == switches::kPpapiPluginProcess);