Make helper app, get closer to working content shell.

content/shell/shell_main_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/shell_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
+#include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_content_plugin_client.h"
 #include "content/shell/shell_content_renderer_client.h"
 #include "content/shell/shell_content_utility_client.h"
 #include "content/shell/shell_render_process_observer.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
+#if defined(OS_MACOSX)
+#include "base/mac/foundation_util.h"
+#endif
+
+#if defined(OS_MACOSX)
+namespace {
+
+void OverrideChildProcessPath() {
+  if (base::mac::IsBackgroundOnlyProcess()) {
+    // The background-only process is the helper; no overriding needed.
+    return;
+  }
+
+  // Start out with the path to the running executable.
+  FilePath helper_path;
+  PathService::Get(base::FILE_EXE, &helper_path);
+
+  // One step up to MacOS, another to Contents.
+  helper_path = helper_path.DirName().DirName();
+  DCHECK_EQ(helper_path.BaseName().value(), "Contents");
+
+  // Go into the frameworks directory.
+  helper_path = helper_path.Append("Frameworks");
+
+  // And the app path.
+  helper_path = helper_path.Append("Content Shell Helper.app")
+                           .Append("Contents")
+                           .Append("MacOS")
+                           .Append("Content Shell Helper");
+
+  PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
+}
+
+}

[Mark Mentovai, 2012/03/09 17:49:26]

This one should be

}  // namespace

[Avi (use Gerrit), 2012/03/09 22:05:59]

Done.

+#endif  // OS_MACOSX
+
 ShellMainDelegate::ShellMainDelegate() {
 }
 
 ShellMainDelegate::~ShellMainDelegate() {
 }
 
 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   return false;
 }
 
 void ShellMainDelegate::PreSandboxStartup() {
+#if defined(OS_MACOSX)
+  OverrideChildProcessPath();
+#endif  // OS_MACOSX
+
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
   content::SetContentClient(&content_client_);
   InitializeShellContentClient(process_type);
 
   InitializeResourceBundle();
 }
 
@@ skipping 54 matching lines @@
   }
 }
 
 void ShellMainDelegate::InitializeResourceBundle() {
   FilePath pak_dir;
   PathService::Get(base::DIR_MODULE, &pak_dir);
 
   FilePath pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
   ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file);
 }