| Index: content/app/content_main_runner.cc
|
| diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
|
| index c04782f162f14f5002104ae99092a2c8610220c2..a8235c3385d328c78da00f783be8f4a31ded2936 100644
|
| --- a/content/app/content_main_runner.cc
|
| +++ b/content/app/content_main_runner.cc
|
| @@ -28,7 +28,6 @@
|
| #include "base/process/launch.h"
|
| #include "base/process/memory.h"
|
| #include "base/process/process_handle.h"
|
| -#include "base/profiler/alternate_timer.h"
|
| #include "base/profiler/scoped_tracker.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_util.h"
|
| @@ -64,10 +63,6 @@
|
| #include "gin/v8_initializer.h"
|
| #endif
|
|
|
| -#if defined(USE_TCMALLOC)
|
| -#include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
|
| -#endif
|
| -
|
| #if !defined(OS_IOS)
|
| #include "content/app/mojo/mojo_init.h"
|
| #include "content/browser/gpu/gpu_process_host.h"
|
| @@ -425,19 +420,6 @@ class ContentMainRunnerImpl : public ContentMainRunner {
|
| TRACE_EVENT0("startup,benchmark", "ContentMainRunnerImpl::Initialize");
|
| #endif // OS_ANDROID
|
|
|
| -#if !defined(OS_MACOSX) && defined(USE_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.
|
| - const char* profiling = getenv(tracked_objects::kAlternateProfilerTime);
|
| - if (profiling &&
|
| - (atoi(profiling) == tracked_objects::TIME_SOURCE_TYPE_TCMALLOC)) {
|
| - tracked_objects::SetAlternateTimeSource(
|
| - MallocExtension::GetBytesAllocatedOnCurrentThread,
|
| - tracked_objects::TIME_SOURCE_TYPE_TCMALLOC);
|
| - }
|
| -#endif // !OS_MACOSX && USE_TCMALLOC
|
| -
|
| #if !defined(OS_IOS)
|
| base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance();
|
| #endif
|
|
|