4 files changed, 4 insertions, 27 deletions
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
index 6267e5ee..9228905 100644
--- a/chrome/browser/extensions/extension_updater.cc
+++ b/chrome/browser/extensions/extension_updater.cc
@@ -284,12 +284,6 @@ class SafeManifestParser : public UtilityProcessHost::Client {
     // UtilityProcessHost should handle it for us. (http://crbug.com/19192)
     bool use_utility_process = rdh &&
         !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
-
-#if defined(OS_LINUX)
-    // TODO(port): Don't use a utility process on linux (crbug.com/22703).
-    use_utility_process = false;
-#endif
-
     if (use_utility_process) {
       UtilityProcessHost* host = new UtilityProcessHost(
           rdh, this, ChromeThread::UI);
diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc
index a3ece10..5203e69 100644
--- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc
+++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc
@@ -64,12 +64,6 @@ void SandboxedExtensionUnpacker::Start() {
   // UtilityProcessHost should handle it for us. (http://crbug.com/19192)
   bool use_utility_process = rdh_ &&
       !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
-
-#if defined(OS_LINUX)
-    // TODO(port): Don't use a utility process on linux (crbug.com/22703).
-    use_utility_process = false;
-#endif
-
   if (use_utility_process) {
     ChromeThread::PostTask(
         ChromeThread::IO, FROM_HERE,
diff --git a/chrome/browser/utility_process_host.cc b/chrome/browser/utility_process_host.cc
index 352425a..9b03634 100644
--- a/chrome/browser/utility_process_host.cc
+++ b/chrome/browser/utility_process_host.cc
@@ -9,6 +9,7 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "ipc/ipc_switches.h"
@@ -55,13 +56,6 @@ FilePath UtilityProcessHost::GetUtilityProcessCmd() {
 }
 
 bool UtilityProcessHost::StartProcess(const FilePath& exposed_dir) {
-#if defined(OS_LINUX)
-  // TODO(port): We should not reach here on Linux (crbug.com/22703).
-  // (crbug.com/23837) covers enabling this on Linux.
-  NOTREACHED();
-  return false;
-#endif
-
   // Name must be set or metrics_service will crash in any test which
   // launches a UtilityProcessHost.
   set_name(L"utility process");
@@ -80,9 +74,10 @@ bool UtilityProcessHost::StartProcess(const FilePath& exposed_dir) {
                                   switches::kUtilityProcess);
   cmd_line->AppendSwitchWithValue(switches::kProcessChannelID,
                                   ASCIIToWide(channel_id()));
-  // Pass on the browser locale.
+  // Pass on the browser locale.  TODO(tony): This touches the disk and
+  // checks for locale dlls/pak files.  It shouldn't need to.
   std::string locale = l10n_util::GetApplicationLocale(L"");
-  cmd_line->AppendSwitchWithValue(switches::kLang, ASCIIToWide(locale));
+  cmd_line->AppendSwitchWithValue(switches::kLang, locale);
 
   SetCrashReporterCommandLine(cmd_line);
 
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc
index 3d213f1..31e41ae 100644
--- a/chrome/browser/web_resource/web_resource_service.cc
+++ b/chrome/browser/web_resource/web_resource_service.cc
@@ -110,12 +110,6 @@ class WebResourceService::UnpackerClient
     bool use_utility_process =
         web_resource_service_->resource_dispatcher_host_ != NULL &&
         !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
-
-#if defined(OS_LINUX)
-    // TODO(port): Don't use a utility process on linux (crbug.com/22703).
-    use_utility_process = false;
-#endif
-
     if (use_utility_process) {
       ChromeThread::ID thread_id;
       CHECK(ChromeThread::GetCurrentThreadIdentifier(&thread_id));