Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 1312273002: NaCl: Re-enable ASLR for nacl-loader processes on Mac OS X (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/nacl/browser/nacl_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « no previous file | components/nacl/browser/nacl_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698