Fix Mac build with disable_nacl=1.

chrome/app/chrome_main_delegate.cc

 // Copyright (c) 2012 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 "chrome/app/chrome_main_delegate.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file_path.h"
@@ skipping 17 matching lines @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/profiling.h"
 #include "chrome/common/switch_utils.h"
 #include "chrome/common/url_constants.h"
 #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/component_updater/component_updater_paths.h"
-#include "components/nacl/common/nacl_switches.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
 #include <malloc.h>
 #include <algorithm>
 #include "base/strings/string_util.h"
@@ skipping 53 matching lines @@
 #endif
 
 #if defined(OS_LINUX)
 #include "base/environment.h"
 #endif
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
 #include "chrome/browser/policy/policy_path_parser.h"
 #endif
 
+#if !defined(DISABLE_NACL)
+#include "components/nacl/common/nacl_switches.h"
+#endif
+
 #if !defined(CHROME_MULTIPLE_DLL_CHILD)
 base::LazyInstance<chrome::ChromeContentBrowserClient>
     g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
 #endif
 
 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
 base::LazyInstance<ChromeContentRendererClient>
     g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<ChromeContentUtilityClient>
     g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER;
@@ skipping 105 matching lines @@
       // Needed for scrollbar related images.
       process_type == switches::kWorkerProcess ||
 #endif
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
       // The zygote process opens the resources for the renderers.
       process_type == switches::kZygoteProcess ||
 #endif
 #if defined(OS_MACOSX)
       // Mac needs them too for scrollbar related images and for sandbox
       // profiles.
+#if !defined(DISABLE_NACL)
       process_type == switches::kNaClLoaderProcess ||
+#endif
       process_type == switches::kPpapiPluginProcess ||
       process_type == switches::kPpapiBrokerProcess ||
       process_type == switches::kGpuProcess ||
 #endif
       process_type == switches::kRendererProcess ||
       process_type == switches::kUtilityProcess;
 }
 
 #if defined(OS_POSIX)
 // Check for --version and --product-version; return true if we encountered
@@ skipping 343 matching lines @@
       std::string last_three =
           executable.value().substr(executable.value().size() - 3);
 
       if (last_three == " EH") {
         CHECK(process_type == switches::kPluginProcess ||
               process_type == switches::kUtilityProcess)
             << "Executable-heap process requires --type="
             << switches::kPluginProcess << " or "
             << switches::kUtilityProcess << ", saw " << process_type;
       } else if (last_three == " NP") {
+#if !defined(DISABLE_NACL)
         CHECK_EQ(switches::kNaClLoaderProcess, process_type)
             << "Non-PIE process requires --type="
             << switches::kNaClLoaderProcess << ", saw " << process_type;
+#endif
       } else {
+#if defined(DISABLE_NACL)
+        CHECK(process_type != switches::kPluginProcess)
+            << "Non-executable-heap PIE process is intolerant of --type="
+            << switches::kPluginProcess;
+#else
         CHECK(process_type != switches::kPluginProcess &&
               process_type != switches::kNaClLoaderProcess)
             << "Non-executable-heap PIE process is intolerant of --type="
             << switches::kPluginProcess << " and "
             << switches::kNaClLoaderProcess << ", saw " << process_type;
+#endif
       }
     }
   } else {
     CHECK(!command_line.HasSwitch(switches::kProcessType) &&
           process_type.empty())
         << "Main application forbids --type, saw " << process_type;
   }
 
   if (breakpad::IsCrashReporterEnabled())
     breakpad::InitCrashProcessInfo(process_type);
@@ skipping 202 matching lines @@
   logging::CleanupChromeLogging();
 #else
   // Android doesn't use InitChromeLogging, so we close the log file manually.
   logging::CloseLogFile();
 #endif  // !defined(OS_ANDROID)
 }
 
 #if defined(OS_MACOSX)
 bool ChromeMainDelegate::ProcessRegistersWithSystemProcess(
     const std::string& process_type) {
+#if defined(DISABLE_NACL)
+  return false;
+#else
   return process_type == switches::kNaClLoaderProcess;
+#endif
 }
 
 bool ChromeMainDelegate::ShouldSendMachPort(const std::string& process_type) {
   return process_type != switches::kRelauncherProcess &&
       process_type != switches::kServiceProcess;
 }
 
 bool ChromeMainDelegate::DelaySandboxInitialization(
     const std::string& process_type) {
+#if !defined(DISABLE_NACL)
   // NaClLoader does this in NaClMainPlatformDelegate::EnableSandbox().
   // No sandbox needed for relauncher.
-  return process_type == switches::kNaClLoaderProcess ||
-      process_type == switches::kRelauncherProcess;
+  if (process_type == switches::kNaClLoaderProcess)
+    return true;
+#endif
+  return process_type == switches::kRelauncherProcess;
 }
 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
 void ChromeMainDelegate::ZygoteStarting(
     ScopedVector<content::ZygoteForkDelegate>* delegates) {
 #if !defined(DISABLE_NACL)
   nacl::AddNaClZygoteForkDelegates(delegates);
 #endif
 }
 
 void ChromeMainDelegate::ZygoteForked() {
@@ skipping 43 matching lines @@
 }
 
 content::ContentUtilityClient*
 ChromeMainDelegate::CreateContentUtilityClient() {
 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return g_chrome_content_utility_client.Pointer();
 #endif
 }