[Tracing] Disable registration of regular dump providers during tests

base/trace_event/memory_dump_manager.cc

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 fe8423a72753a4822fca54881bef832979b58f11..1030d5741a7b188430f66961587357d3ed45b8e8 100644
--- a/base/trace_event/memory_dump_manager.cc
+++ b/base/trace_event/memory_dump_manager.cc
@@ -99,8 +99,6 @@ MemoryDumpManager* MemoryDumpManager::GetInstance() {
 
 // static
 void MemoryDumpManager::SetInstanceForTesting(MemoryDumpManager* instance) {
-  if (instance)
-    instance->skip_core_dumpers_auto_registration_for_testing_ = true;
   g_instance_for_testing = instance;
 }
 
@@ -109,7 +107,7 @@ MemoryDumpManager::MemoryDumpManager()
       is_coordinator_(false),
       memory_tracing_enabled_(0),
       tracing_process_id_(kInvalidTracingProcessId),
-      skip_core_dumpers_auto_registration_for_testing_(false) {
+      dumper_registrations_ignored_for_testing_(false) {
   g_next_guid.GetNext();  // Make sure that first guid is not zero.
 
   heap_profiling_enabled_ = CommandLine::InitializedForCurrentProcess()
@@ -133,7 +131,6 @@ void MemoryDumpManager::Initialize(MemoryDumpManagerDelegate* delegate,
   }
 
   // Enable the core dump providers.
-  if (!skip_core_dumpers_auto_registration_for_testing_) {
 #if !defined(OS_NACL)
     RegisterDumpProvider(ProcessMemoryTotalsDumpProvider::GetInstance());

[dsinclair, 2015/10/20 14:31:39]

Indenting

[Ruud van Asseldonk, 2015/10/20 15:09:17]

Done.

 #endif
@@ -150,7 +147,6 @@ void MemoryDumpManager::Initialize(MemoryDumpManagerDelegate* delegate,
 #if defined(OS_WIN)
     RegisterDumpProvider(WinHeapDumpProvider::GetInstance());
 #endif
-  }  // !skip_core_dumpers_auto_registration_for_testing_
 
   // If tracing was enabled before initializing MemoryDumpManager, we missed the
   // OnTraceLogEnabled() event. Synthetize it so we can late-join the party.
@@ -164,6 +160,9 @@ void MemoryDumpManager::Initialize(MemoryDumpManagerDelegate* delegate,
 void MemoryDumpManager::RegisterDumpProvider(
     MemoryDumpProvider* mdp,
     const scoped_refptr<SingleThreadTaskRunner>& task_runner) {
+  if (dumper_registrations_ignored_for_testing_)
+    return;
+
   MemoryDumpProviderInfo mdp_info(mdp, task_runner);
   AutoLock lock(lock_);
   auto iter_new = dump_providers_.insert(mdp_info);