Chromium Code Reviews| Index: base/trace_event/memory_dump_manager.cc |
| diff --git a/base/trace_event/memory_dump_manager.cc b/base/trace_event/memory_dump_manager.cc |
| index 008b22a2d30be84f4e79db9b2c20de715c7c95ce..719529e45dddbc1da1ae91dcea0d846c6a7a49b6 100644 |
| --- a/base/trace_event/memory_dump_manager.cc |
| +++ b/base/trace_event/memory_dump_manager.cc |
| @@ -201,6 +201,18 @@ void MemoryDumpManager::EnableHeapProfilingIfNeeded() { |
| switches::kEnableHeapProfiling)) |
| return; |
| +#if !BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM) |
|
Wez
2017/05/24 21:29:25
Do we ever actually set this under Windows? The W
Primiano Tucci (use gerrit)
2017/05/25 10:46:51
I thought so:
From build/config/allocator.gni:
i
|
| +#if defined(OS_WIN) |
| + const char kExtraErrMsg[] = "On Windows it requires release + static builds."; |
| +#else |
| + const char kExtraErrMsg[] = ""; |
| +#endif // defined(OS_WIN) |
| + LOG(FATAL) << "--" << switches::kEnableHeapProfiling |
| + << " requires building with use_experimental_allocator_shim=true " |
| + "(on by default on the major platforms). " |
| + << kExtraErrMsg; |
| +#endif // BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM) |
| + |
| std::string profiling_mode = CommandLine::ForCurrentProcess() |
| ->GetSwitchValueASCII(switches::kEnableHeapProfiling); |
| if (profiling_mode == switches::kEnableHeapProfilingModePseudo) { |