diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 23:46:40 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 23:46:40 +0000 |
| commit | cd75a5001fe541b418a0f46efd8c25201a4015e2 (patch) | |
| tree | faa72462076478ff4436167ce6a07a805ddacf17 /chrome/browser/browser_main.cc | |
| parent | 6452f1c0627a15a097472da9ea848408ebe080a8 (diff) | |
| download | chromium_src-cd75a5001fe541b418a0f46efd8c25201a4015e2.zip chromium_src-cd75a5001fe541b418a0f46efd8c25201a4015e2.tar.gz chromium_src-cd75a5001fe541b418a0f46efd8c25201a4015e2.tar.bz2 | |
Revert 77207 - Support mixed allocation in browser vs subprocesses
Continue to support selection of a browser allocator
selection via the environment variable CHROME_ALLOCATOR,
and also add CHROME_ALLOCATOR_2 that can select the
allocator to use in subprocesses, such as a renderer.
Temporarilly set the browser default to the
default windows heap allocator, and the subprocess
allocator to TCMalloc to help detect memory corruption
in a cannary for a few days.
Add minor cleanup (removing reserved word "override"
etc.).
r=mbelshe
bug=74901
Review URL: http://codereview.chromium.org/6623059
TBR=jar@chromium.org
Review URL: http://codereview.chromium.org/6623069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 745be4c..a7a565c 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -8,7 +8,6 @@ #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" @@ -1140,11 +1139,6 @@ int BrowserMain(const MainFunctionParams& parameters) { 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); |