| Index: content/app/content_main_runner.cc
|
| diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
|
| index ce1f5c9a2e6bd236c4b88f6d70d02447a06f98de..9c2192af15dc39b4956be25bb77ca678c25b66cd 100644
|
| --- a/content/app/content_main_runner.cc
|
| +++ b/content/app/content_main_runner.cc
|
| @@ -549,6 +549,7 @@ 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.
|
| @@ -559,7 +560,8 @@ class ContentMainRunnerImpl : public ContentMainRunner {
|
| MallocExtension::GetBytesAllocatedOnCurrentThread,
|
| tracked_objects::TIME_SOURCE_TYPE_TCMALLOC);
|
| }
|
| -#endif
|
| +#endif // !defined(USE_SYSTEM_TCMALLOC)
|
| +#endif // !defined(OS_MACOSX) && defined(USE_TCMALLOC)
|
|
|
| // On Android,
|
| // - setlocale() is not supported.
|
|
|