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

Unified Diff: chrome/app/chrome_dll_main.cc

Issue 434077: Add regex escaping code to Mac sandbox implementation and re-enable the utility process on OS X. (Closed)
Patch Set: Sync to trunk Created 11 years 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 | chrome/browser/extensions/extension_updater.cc » ('j') | chrome/common/sandbox_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_dll_main.cc
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 2217c8eae43cd086d034d5d40d78eeb439a9a0e5..07ccf6dcf75c1a5e0d1593194e808e221e375017 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -554,8 +554,13 @@ int ChromeMain(int argc, char** argv) {
// On OS X the renderer sandbox needs to be initialized later in the startup
// sequence in RendererMainPlatformDelegate::PlatformInitialize().
if (process_type != switches::kRendererProcess &&
- process_type != switches::kExtensionProcess)
- sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type);
+ process_type != switches::kExtensionProcess) {
+ bool sandbox_initialized_ok =
+ sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type);
+ // Die if the sandbox can't be enabled.
+ CHECK(sandbox_initialized_ok) << "Error initializing sandbox for "
+ << process_type;
+ }
#endif // OS_MACOSX
startup_timer.Stop(); // End of Startup Time Measurement.
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_updater.cc » ('j') | chrome/common/sandbox_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698