Support mixed allocation in browser vs subprocesses...

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc	(revision 77155)
+++ chrome/browser/browser_main.cc	(working copy)
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/allocator/allocator_shim.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ -1139,6 +1140,11 @@
   const CommandLine& parsed_command_line = parameters.command_line_;
   base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool_;
 
+#if defined(OS_WIN)
+  // Make this call before going multithreaded, or spawning any subprocesses.
+  base::allocator::SetupSubprocessAllocator();
+#endif  // OS_WIN
+
   FilePath user_data_dir;
 #if defined(OS_WIN)
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);