NaCl: Re-enable ASLR for nacl-loader processes on Mac OS X

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 602 matching lines @@
         executable.value().size() >= 3) {
       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;
   }
 }
 #endif  // defined(OS_MACOSX)
 
@@ skipping 321 matching lines @@
     case version_info::Channel::CANARY:
       return true;
     case version_info::Channel::DEV:
     case version_info::Channel::BETA:
     case version_info::Channel::STABLE:
     default:
       // Don't enable instrumentation.
       return false;
   }
 }