| 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 a74b95634db22a94b480b7ff4d1a7da3029c6cd0..6ed1ca8fff3aa55d94af524a1a0e0057183b02ac 100644
 | 
| --- a/base/trace_event/memory_dump_manager.cc
 | 
| +++ b/base/trace_event/memory_dump_manager.cc
 | 
| @@ -426,7 +426,7 @@ void MemoryDumpManager::UnregisterDumpProviderInternal(
 | 
|  }
 | 
|  
 | 
|  void MemoryDumpManager::RegisterPollingMDPOnDumpThread(
 | 
| -    scoped_refptr<MemoryDumpManager::MemoryDumpProviderInfo> mdpinfo) {
 | 
| +    scoped_refptr<MemoryDumpProviderInfo> mdpinfo) {
 | 
|    AutoLock lock(lock_);
 | 
|    dump_providers_for_polling_.insert(mdpinfo);
 | 
|  
 | 
| @@ -438,7 +438,7 @@ void MemoryDumpManager::RegisterPollingMDPOnDumpThread(
 | 
|  }
 | 
|  
 | 
|  void MemoryDumpManager::UnregisterPollingMDPOnDumpThread(
 | 
| -    scoped_refptr<MemoryDumpManager::MemoryDumpProviderInfo> mdpinfo) {
 | 
| +    scoped_refptr<MemoryDumpProviderInfo> mdpinfo) {
 | 
|    mdpinfo->dump_provider->SuspendFastMemoryPolling();
 | 
|  
 | 
|    AutoLock lock(lock_);
 | 
| @@ -956,34 +956,6 @@ bool MemoryDumpManager::IsDumpModeAllowed(MemoryDumpLevelOfDetail dump_mode) {
 | 
|    return session_state_->IsDumpModeAllowed(dump_mode);
 | 
|  }
 | 
|  
 | 
| -MemoryDumpManager::MemoryDumpProviderInfo::MemoryDumpProviderInfo(
 | 
| -    MemoryDumpProvider* dump_provider,
 | 
| -    const char* name,
 | 
| -    scoped_refptr<SequencedTaskRunner> task_runner,
 | 
| -    const MemoryDumpProvider::Options& options,
 | 
| -    bool whitelisted_for_background_mode)
 | 
| -    : dump_provider(dump_provider),
 | 
| -      name(name),
 | 
| -      task_runner(std::move(task_runner)),
 | 
| -      options(options),
 | 
| -      consecutive_failures(0),
 | 
| -      disabled(false),
 | 
| -      whitelisted_for_background_mode(whitelisted_for_background_mode) {}
 | 
| -
 | 
| -MemoryDumpManager::MemoryDumpProviderInfo::~MemoryDumpProviderInfo() {}
 | 
| -
 | 
| -bool MemoryDumpManager::MemoryDumpProviderInfo::Comparator::operator()(
 | 
| -    const scoped_refptr<MemoryDumpManager::MemoryDumpProviderInfo>& a,
 | 
| -    const scoped_refptr<MemoryDumpManager::MemoryDumpProviderInfo>& b) const {
 | 
| -  if (!a || !b)
 | 
| -    return a.get() < b.get();
 | 
| -  // Ensure that unbound providers (task_runner == nullptr) always run last.
 | 
| -  // Rationale: some unbound dump providers are known to be slow, keep them last
 | 
| -  // to avoid skewing timings of the other dump providers.
 | 
| -  return std::tie(a->task_runner, a->dump_provider) >
 | 
| -         std::tie(b->task_runner, b->dump_provider);
 | 
| -}
 | 
| -
 | 
|  MemoryDumpManager::ProcessMemoryDumpAsyncState::ProcessMemoryDumpAsyncState(
 | 
|      MemoryDumpRequestArgs req_args,
 | 
|      const MemoryDumpProviderInfo::OrderedSet& dump_providers,
 | 
| 
 |