Index: base/trace_event/memory_dump_manager_unittest.cc |
diff --git a/base/trace_event/memory_dump_manager_unittest.cc b/base/trace_event/memory_dump_manager_unittest.cc |
index 330c75d82bdd3e9a52c94502b717d506baad3324..51d41943fba0416fd9ad5f167d78cbbbdbc51a1c 100644 |
--- a/base/trace_event/memory_dump_manager_unittest.cc |
+++ b/base/trace_event/memory_dump_manager_unittest.cc |
@@ -119,8 +119,7 @@ |
// requests locally to the MemoryDumpManager instead of performing IPC dances. |
class MemoryDumpManagerDelegateForTesting : public MemoryDumpManagerDelegate { |
public: |
- MemoryDumpManagerDelegateForTesting(bool is_coordinator) |
- : is_coordinator_(is_coordinator) { |
+ MemoryDumpManagerDelegateForTesting() { |
ON_CALL(*this, RequestGlobalMemoryDump(_, _)) |
.WillByDefault(Invoke( |
this, &MemoryDumpManagerDelegateForTesting::CreateProcessDump)); |
@@ -130,13 +129,13 @@ |
void(const MemoryDumpRequestArgs& args, |
const MemoryDumpCallback& callback)); |
- bool IsCoordinator() const override { return is_coordinator_; } |
+ uint64_t GetTracingProcessId() const override { |
+ NOTREACHED(); |
+ return MemoryDumpManager::kInvalidTracingProcessId; |
+ } |
// Promote the CreateProcessDump to public so it can be used by test fixtures. |
using MemoryDumpManagerDelegate::CreateProcessDump; |
- |
- private: |
- bool is_coordinator_; |
}; |
class MockMemoryDumpProvider : public MemoryDumpProvider { |
@@ -221,12 +220,13 @@ |
mdm_.reset(new MemoryDumpManager()); |
MemoryDumpManager::SetInstanceForTesting(mdm_.get()); |
ASSERT_EQ(mdm_.get(), MemoryDumpManager::GetInstance()); |
+ delegate_.reset(new MemoryDumpManagerDelegateForTesting); |
} |
void TearDown() override { |
MemoryDumpManager::SetInstanceForTesting(nullptr); |
+ mdm_.reset(); |
delegate_.reset(); |
- mdm_.reset(); |
message_loop_.reset(); |
TraceLog::DeleteForTesting(); |
} |
@@ -248,8 +248,7 @@ |
protected: |
void InitializeMemoryDumpManager(bool is_coordinator) { |
mdm_->set_dumper_registrations_ignored_for_testing(true); |
- delegate_.reset(new MemoryDumpManagerDelegateForTesting(is_coordinator)); |
- mdm_->Initialize(delegate_.get()); |
+ mdm_->Initialize(delegate_.get(), is_coordinator); |
} |
void RequestGlobalDumpAndWait(MemoryDumpType dump_type, |
@@ -898,6 +897,7 @@ |
// initialization gets NACK-ed cleanly. |
{ |
EXPECT_CALL(mdp, OnMemoryDump(_, _)).Times(0); |
+ EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(0); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
MemoryDumpLevelOfDetail::DETAILED); |
EXPECT_FALSE(last_callback_success_); |
@@ -906,9 +906,9 @@ |
// Now late-initialize the MemoryDumpManager and check that the |
// RequestGlobalDump completes successfully. |
{ |
- InitializeMemoryDumpManager(false /* is_coordinator */); |
EXPECT_CALL(mdp, OnMemoryDump(_, _)).Times(1); |
EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ InitializeMemoryDumpManager(false /* is_coordinator */); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
MemoryDumpLevelOfDetail::DETAILED); |
EXPECT_TRUE(last_callback_success_); |