Chromium -> Mojo roll.

base/trace_event/memory_dump_manager.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/trace_event/memory_dump_manager.h"
 
 #include <algorithm>
 
 #include "base/atomic_sequence_num.h"
 #include "base/compiler_specific.h"
@@ skipping 41 matching lines @@
 
   return Singleton<MemoryDumpManager,
                    LeakySingletonTraits<MemoryDumpManager>>::get();
 }
 
 // static
 void MemoryDumpManager::SetInstanceForTesting(MemoryDumpManager* instance) {
   g_instance_for_testing = instance;
 }
 
-MemoryDumpManager::MemoryDumpManager() : memory_tracing_enabled_(0) {
+MemoryDumpManager::MemoryDumpManager()
+    : dump_provider_currently_active_(nullptr), memory_tracing_enabled_(0) {
 }
 
 MemoryDumpManager::~MemoryDumpManager() {
   base::trace_event::TraceLog::GetInstance()->RemoveEnabledStateObserver(this);
 }
 
 void MemoryDumpManager::Initialize() {
   TRACE_EVENT0(kTraceCategory, "init");  // Add to trace-viewer category list.
   trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(this);
 }
@@ skipping 48 matching lines @@
                                              uint64 guid) {
   bool did_any_provider_dump = false;
   scoped_ptr<ProcessMemoryDump> pmd(new ProcessMemoryDump());
 
   // Serialize dump point generation so that memory dump providers don't have to
   // deal with thread safety.
   {
     AutoLock lock(lock_);
     for (auto it = dump_providers_enabled_.begin();
          it != dump_providers_enabled_.end();) {
-      MemoryDumpProvider* dump_provider = *it;
-      if (dump_provider->DumpInto(pmd.get())) {
+      dump_provider_currently_active_ = *it;
+      if (dump_provider_currently_active_->DumpInto(pmd.get())) {
         did_any_provider_dump = true;
         ++it;
       } else {
-        LOG(ERROR) << "The memory dumper " << dump_provider->GetFriendlyName()
+        LOG(ERROR) << "The memory dumper "
+                   << dump_provider_currently_active_->GetFriendlyName()
                    << " failed, possibly due to sandboxing (crbug.com/461788), "
                       "disabling it for current process. Try restarting chrome "
                       "with the --no-sandbox switch.";
         it = dump_providers_enabled_.erase(it);
       }
+      dump_provider_currently_active_ = nullptr;
     }
   }
 
   // Don't create a dump point if all the dumpers failed.
   if (!did_any_provider_dump)
     return;
 
   scoped_refptr<ConvertableToTraceFormat> event_value(new TracedValue());
   pmd->AsValueInto(static_cast<TracedValue*>(event_value.get()));
   const char* const event_name = DumpPointTypeToString(dump_point_type);
@@ skipping 23 matching lines @@
 }
 
 void MemoryDumpManager::OnTraceLogDisabled() {
   AutoLock lock(lock_);
   dump_providers_enabled_.clear();
   subtle::NoBarrier_Store(&memory_tracing_enabled_, 0);
 }
 
 }  // namespace trace_event
 }  // namespace base