Index: content/browser/tracing/tracing_controller_impl.cc |
diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc |
index 7b155db3dff2099717a91383caaeb1f66d87ecab..32aa7869d9dcccfc48940d36d3c89a64054ec0f9 100644 |
--- a/content/browser/tracing/tracing_controller_impl.cc |
+++ b/content/browser/tracing/tracing_controller_impl.cc |
@@ -913,6 +913,10 @@ void TracingControllerImpl::OnClockSyncMarkerRecordedByAgent( |
void TracingControllerImpl::RequestGlobalMemoryDump( |
const base::trace_event::MemoryDumpRequestArgs& args, |
const base::trace_event::MemoryDumpCallback& callback) { |
+ if (!base::trace_event::MemoryDumpManager::GetInstance()->IsDumpModeAllowed( |
Primiano Tucci (use gerrit)
2016/06/09 18:46:39
why do we need this extra check here? Can we let i
ssid
2016/06/09 21:34:15
It is a public method of TracingControllerImpl and
Primiano Tucci (use gerrit)
2016/06/10 12:31:57
Yes what I am saying is that this checks seems sup
ssid
2016/06/10 18:23:47
MDM can't nack the dump if someone calls TracingCo
Primiano Tucci (use gerrit)
2016/06/13 19:56:54
Ok fine. But let's instead make this a CHECK in M
ssid
2016/06/14 01:26:11
Done.
|
+ args.level_of_detail)) |
+ return; |
+ |
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) { |
BrowserThread::PostTask( |
BrowserThread::UI, FROM_HERE, |