Index: content/shell/shell_main_delegate.cc |
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc |
index 04ed95da3c6315f55b3e2bcf8be20c969aa51ab1..6dc3fb51fa4e920e987dacb0c7353e5336fe7431 100644 |
--- a/content/shell/shell_main_delegate.cc |
+++ b/content/shell/shell_main_delegate.cc |
@@ -94,6 +94,12 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
// Enable trace control and transport through event tracing for Windows. |
logging::LogEventProvider::Initialize(kContentShellProviderName); |
#endif |
+#if defined(OS_MACOSX) |
+ // Needs to happen before InitializeResourceBundle() and before |
+ // WebKitTestPlatformInitialize() are called. |
+ OverrideFrameworkBundlePath(); |
+ OverrideChildProcessPath(); |
+#endif // OS_MACOSX |
InitLogging(); |
CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
@@ -122,10 +128,6 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
} |
void ShellMainDelegate::PreSandboxStartup() { |
-#if defined(OS_MACOSX) |
- OverrideFrameworkBundlePath(); |
- OverrideChildProcessPath(); |
-#endif // OS_MACOSX |
InitializeResourceBundle(); |
} |