Override the framework path in PreSandboxStartup.

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/logging.h"
 #include "base/path_service.h"
@@ skipping 43 matching lines @@
   NOTREACHED();
 #endif
 }
 
 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
     InitLogging();
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kAllowFileAccessFromFiles);
   }
-#if defined(OS_MACOSX)
-  OverrideFrameworkBundlePath();
-#endif
   SetContentClient(&content_client_);
   return false;
 }
 
 void ShellMainDelegate::PreSandboxStartup() {
 #if defined(OS_MACOSX)
+  OverrideFrameworkBundlePath();

[Avi (use Gerrit), 2012/07/31 14:54:58]

Note that the location of this call was mirroring its location in Chrome. Do we
want to move it in Chrome too to match?

[jochen (gone - plz use gerrit), 2012/07/31 14:59:26]

I don't know why it's called there.

The problem is that ContentBrowserTest::SetUp only invokes PreSandboxStartup,
but not BasicStartupComplete

   OverrideChildProcessPath();
 #endif  // OS_MACOSX
   InitializeResourceBundle();
 }
 
 int ShellMainDelegate::RunProcess(
     const std::string& process_type,
     const MainFunctionParams& main_function_params) {
   if (!process_type.empty())
     return -1;
@@ skipping 49 matching lines @@
   browser_client_.reset(new ShellContentBrowserClient);
   return browser_client_.get();
 }
 
 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(new ShellContentRendererClient);
   return renderer_client_.get();
 }
 
 }  // namespace content