Index: chrome/app/chrome_main_delegate.cc |
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc |
index d9e1b158af770e81ddefe6eb5f198acde70616a4..342c6b6616eba8b6fa49134a288ae6021fb50f51 100644 |
--- a/chrome/app/chrome_main_delegate.cc |
+++ b/chrome/app/chrome_main_delegate.cc |
@@ -620,24 +620,10 @@ void ChromeMainDelegate::InitMacCrashReporter( |
<< "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 { |