diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-18 11:57:04 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-18 11:57:04 +0000 |
| commit | 597323a0200c45d36a479beaaf3314abd5545038 (patch) | |
| tree | b40f03f59f229f1092fc1cbe0a91beecddb54acc /content/app | |
| parent | 65011fae2814e7344bff976ffb6827543790be5f (diff) | |
| download | chromium_src-597323a0200c45d36a479beaaf3314abd5545038.zip chromium_src-597323a0200c45d36a479beaaf3314abd5545038.tar.gz chromium_src-597323a0200c45d36a479beaaf3314abd5545038.tar.bz2 | |
Revert 183089
Needs owner review
> Linux: add option to use system tcmalloc (off by default)
>
> This changes things only for Linux distros, Google Chrome
> will continue to use bundled tcmalloc.
>
> TBR=darin
>
> BUG=174634
>
> Review URL: https://codereview.chromium.org/12224030
TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/12298019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/content_main_runner.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 9c2192a..ce1f5c9 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -549,7 +549,6 @@ class ContentMainRunnerImpl : public ContentMainRunner { base::allocator::SetGetStatsFunction(GetStatsThunk); base::allocator::SetReleaseFreeMemoryFunction(ReleaseFreeMemoryThunk); -#if !defined(USE_SYSTEM_TCMALLOC) // Provide optional hook for monitoring allocation quantities on a // per-thread basis. Only set the hook if the environment indicates this // needs to be enabled. @@ -560,8 +559,7 @@ class ContentMainRunnerImpl : public ContentMainRunner { MallocExtension::GetBytesAllocatedOnCurrentThread, tracked_objects::TIME_SOURCE_TYPE_TCMALLOC); } -#endif // !defined(USE_SYSTEM_TCMALLOC) -#endif // !defined(OS_MACOSX) && defined(USE_TCMALLOC) +#endif // On Android, // - setlocale() is not supported. |