Add regex escaping code to Mac sandbox implementation and re-enable the utility process on OS X.

Other changes:
* An error initializing the sandbox on OS X is now treated as fatal.
* Improved error reporting for sandbox-related failures.

BUG=26492,23837
TEST=Installing extensions and themes should still work on OS X.

Review URL: http://codereview.chromium.org/434077

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33682 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 10 insertions, 13 deletions

diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
index a618de9..f79dc7d 100644
--- a/chrome/browser/extensions/extension_updater.cc
+++ b/chrome/browser/extensions/extension_updater.cc
@@ -269,9 +269,8 @@ class SafeManifestParser : public UtilityProcessHost::Client {
     bool use_utility_process = rdh &&
         !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
 
-#if defined(OS_POSIX)
-    // TODO(port): Don't use a utility process on linux (crbug.com/22703) or
-    // MacOS (crbug.com/8102) until problems related to autoupdate are fixed.
+#if defined(OS_LINUX)
+    // TODO(port): Don't use a utility process on linux (crbug.com/22703).
     use_utility_process = false;
 #endif
 
diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc
index 46167ad..a3ece10 100644
--- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc
+++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc
@@ -65,9 +65,8 @@ void SandboxedExtensionUnpacker::Start() {
   bool use_utility_process = rdh_ &&
       !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
 
-#if defined(OS_POSIX)
-    // TODO(port): Don't use a utility process on linux (crbug.com/22703) or
-    // MacOS (crbug.com/8102) until problems related to autoupdate are fixed.
+#if defined(OS_LINUX)
+    // TODO(port): Don't use a utility process on linux (crbug.com/22703).
     use_utility_process = false;
 #endif
 
diff --git a/chrome/browser/utility.sb b/chrome/browser/utility.sb
index 291e677..3f88f1cb 100644
--- a/chrome/browser/utility.sb
+++ b/chrome/browser/utility.sb
@@ -36,5 +36,5 @@
 ; Needed for IPC on 10.6
 ;10.6_ONLY (allow ipc-posix-shm)
 
-; Enable full access to given directory.
-(allow file-read* file-write* (regex #"^DIR_TO_ALLOW_ACCESS"))
+; Enable full access to given directory if needed.
+;ENABLE_DIRECTORY_ACCESS (allow file-read* file-write* (regex #"DIR_TO_ALLOW_ACCESS"))
diff --git a/chrome/browser/utility_process_host.cc b/chrome/browser/utility_process_host.cc
index 9f7d647..352425a 100644
--- a/chrome/browser/utility_process_host.cc
+++ b/chrome/browser/utility_process_host.cc
@@ -55,9 +55,9 @@ FilePath UtilityProcessHost::GetUtilityProcessCmd() {
 }
 
 bool UtilityProcessHost::StartProcess(const FilePath& exposed_dir) {
-#if defined(OS_POSIX)
+#if defined(OS_LINUX)
   // TODO(port): We should not reach here on Linux (crbug.com/22703).
-  // (crbug.com/23837) covers enabling this on Linux/OS X.
+  // (crbug.com/23837) covers enabling this on Linux.
   NOTREACHED();
   return false;
 #endif
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc
index c4ffa47..3d213f1 100644
--- a/chrome/browser/web_resource/web_resource_service.cc
+++ b/chrome/browser/web_resource/web_resource_service.cc
@@ -111,9 +111,8 @@ class WebResourceService::UnpackerClient
         web_resource_service_->resource_dispatcher_host_ != NULL &&
         !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
 
-#if defined(OS_POSIX)
-    // TODO(port): Don't use a utility process on linux (crbug.com/22703) or
-    // MacOS (crbug.com/8102) until problems related to autoupdate are fixed.
+#if defined(OS_LINUX)
+    // TODO(port): Don't use a utility process on linux (crbug.com/22703).
     use_utility_process = false;
 #endif