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 51d41943fba0416fd9ad5f167d78cbbbdbc51a1c..72f817c86460ee6adc39f50bb986ef7ee4a3cf2a 100644 |
--- a/base/trace_event/memory_dump_manager_unittest.cc |
+++ b/base/trace_event/memory_dump_manager_unittest.cc |
@@ -119,7 +119,8 @@ void PostTaskAndWait(const tracked_objects::Location& from_here, |
// requests locally to the MemoryDumpManager instead of performing IPC dances. |
class MemoryDumpManagerDelegateForTesting : public MemoryDumpManagerDelegate { |
public: |
- MemoryDumpManagerDelegateForTesting() { |
+ MemoryDumpManagerDelegateForTesting(bool is_coordinator) |
+ : is_coordinator_(is_coordinator) { |
ON_CALL(*this, RequestGlobalMemoryDump(_, _)) |
.WillByDefault(Invoke( |
this, &MemoryDumpManagerDelegateForTesting::CreateProcessDump)); |
@@ -129,13 +130,13 @@ class MemoryDumpManagerDelegateForTesting : public MemoryDumpManagerDelegate { |
void(const MemoryDumpRequestArgs& args, |
const MemoryDumpCallback& callback)); |
- uint64_t GetTracingProcessId() const override { |
- NOTREACHED(); |
- return MemoryDumpManager::kInvalidTracingProcessId; |
- } |
+ bool IsCoordinator() const override { return is_coordinator_; } |
// Promote the CreateProcessDump to public so it can be used by test fixtures. |
using MemoryDumpManagerDelegate::CreateProcessDump; |
+ |
+ private: |
+ bool is_coordinator_; |
}; |
class MockMemoryDumpProvider : public MemoryDumpProvider { |
@@ -220,13 +221,13 @@ class MemoryDumpManagerTest : public testing::Test { |
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(); |
+ delegate_ptr_ = nullptr; |
+ mdm_.reset(); |
message_loop_.reset(); |
TraceLog::DeleteForTesting(); |
} |
@@ -248,7 +249,9 @@ class MemoryDumpManagerTest : public testing::Test { |
protected: |
void InitializeMemoryDumpManager(bool is_coordinator) { |
mdm_->set_dumper_registrations_ignored_for_testing(true); |
- mdm_->Initialize(delegate_.get(), is_coordinator); |
+ delegate_.reset(new MemoryDumpManagerDelegateForTesting(is_coordinator)); |
+ delegate_ptr_ = delegate_.get(); |
+ mdm_->Initialize(std::move(delegate_)); |
} |
void RequestGlobalDumpAndWait(MemoryDumpType dump_type, |
@@ -284,6 +287,7 @@ class MemoryDumpManagerTest : public testing::Test { |
const MemoryDumpProvider::Options kDefaultOptions; |
std::unique_ptr<MemoryDumpManager> mdm_; |
std::unique_ptr<MemoryDumpManagerDelegateForTesting> delegate_; |
+ MemoryDumpManagerDelegateForTesting* delegate_ptr_; |
Primiano Tucci (use gerrit)
2017/03/13 21:31:10
we do we need both here, unique_ptr has an operato
chiniforooshan
2017/03/14 16:06:36
No, actually. Know that the delegate is not a glob
Primiano Tucci (use gerrit)
2017/03/15 16:59:40
Ahh hold on, now I read it correctly.
Yes, you are
chiniforooshan
2017/03/15 18:27:30
Done.
|
bool last_callback_success_; |
private: |
@@ -302,7 +306,7 @@ TEST_F(MemoryDumpManagerTest, SingleDumper) { |
// Check that the dumper is not called if the memory category is not enabled. |
EnableTracingWithLegacyCategories("foobar-but-not-memory"); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(0); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(0); |
EXPECT_CALL(mdp, OnMemoryDump(_, _)).Times(0); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
MemoryDumpLevelOfDetail::DETAILED); |
@@ -311,7 +315,7 @@ TEST_F(MemoryDumpManagerTest, SingleDumper) { |
// Now repeat enabling the memory category and check that the dumper is |
// invoked this time. |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(3); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(3); |
EXPECT_CALL(mdp, OnMemoryDump(_, _)).Times(3).WillRepeatedly(Return(true)); |
for (int i = 0; i < 3; ++i) |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
@@ -323,7 +327,7 @@ TEST_F(MemoryDumpManagerTest, SingleDumper) { |
// Finally check the unregister logic: the delegate will be invoked but not |
// the dump provider, as it has been unregistered. |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(3); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(3); |
EXPECT_CALL(mdp, OnMemoryDump(_, _)).Times(0); |
for (int i = 0; i < 3; ++i) { |
@@ -341,7 +345,7 @@ TEST_F(MemoryDumpManagerTest, CheckMemoryDumpArgs) { |
RegisterDumpProvider(&mdp, ThreadTaskRunnerHandle::Get()); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
EXPECT_CALL(mdp, OnMemoryDump(IsDetailedDump(), _)).WillOnce(Return(true)); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
MemoryDumpLevelOfDetail::DETAILED); |
@@ -352,7 +356,7 @@ TEST_F(MemoryDumpManagerTest, CheckMemoryDumpArgs) { |
// OnMemoryDump() call on dump providers. |
RegisterDumpProvider(&mdp, ThreadTaskRunnerHandle::Get()); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
EXPECT_CALL(mdp, OnMemoryDump(IsLightDump(), _)).WillOnce(Return(true)); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
MemoryDumpLevelOfDetail::LIGHT); |
@@ -371,7 +375,7 @@ TEST_F(MemoryDumpManagerTest, SharedSessionState) { |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
const MemoryDumpSessionState* session_state = |
mdm_->session_state_for_testing().get(); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(2); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(2); |
EXPECT_CALL(mdp1, OnMemoryDump(_, _)) |
.Times(2) |
.WillRepeatedly(Invoke([session_state](const MemoryDumpArgs&, |
@@ -404,7 +408,7 @@ TEST_F(MemoryDumpManagerTest, MultipleDumpers) { |
// Enable only mdp1. |
RegisterDumpProvider(&mdp1, ThreadTaskRunnerHandle::Get()); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
EXPECT_CALL(mdp1, OnMemoryDump(_, _)).WillOnce(Return(true)); |
EXPECT_CALL(mdp2, OnMemoryDump(_, _)).Times(0); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
@@ -415,7 +419,7 @@ TEST_F(MemoryDumpManagerTest, MultipleDumpers) { |
mdm_->UnregisterDumpProvider(&mdp1); |
RegisterDumpProvider(&mdp2, nullptr); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
EXPECT_CALL(mdp1, OnMemoryDump(_, _)).Times(0); |
EXPECT_CALL(mdp2, OnMemoryDump(_, _)).WillOnce(Return(true)); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
@@ -425,7 +429,7 @@ TEST_F(MemoryDumpManagerTest, MultipleDumpers) { |
// Enable both mdp1 and mdp2. |
RegisterDumpProvider(&mdp1, nullptr); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
EXPECT_CALL(mdp1, OnMemoryDump(_, _)).WillOnce(Return(true)); |
EXPECT_CALL(mdp2, OnMemoryDump(_, _)).WillOnce(Return(true)); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
@@ -442,7 +446,7 @@ TEST_F(MemoryDumpManagerTest, RegistrationConsistency) { |
RegisterDumpProvider(&mdp, ThreadTaskRunnerHandle::Get()); |
{ |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
EXPECT_CALL(mdp, OnMemoryDump(_, _)).WillOnce(Return(true)); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
@@ -453,7 +457,7 @@ TEST_F(MemoryDumpManagerTest, RegistrationConsistency) { |
mdm_->UnregisterDumpProvider(&mdp); |
{ |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
EXPECT_CALL(mdp, OnMemoryDump(_, _)).Times(0); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
@@ -465,7 +469,7 @@ TEST_F(MemoryDumpManagerTest, RegistrationConsistency) { |
mdm_->UnregisterDumpProvider(&mdp); |
{ |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
EXPECT_CALL(mdp, OnMemoryDump(_, _)).Times(0); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
@@ -478,7 +482,7 @@ TEST_F(MemoryDumpManagerTest, RegistrationConsistency) { |
RegisterDumpProvider(&mdp, ThreadTaskRunnerHandle::Get()); |
{ |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
EXPECT_CALL(mdp, OnMemoryDump(_, _)).WillOnce(Return(true)); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
@@ -521,7 +525,7 @@ TEST_F(MemoryDumpManagerTest, RespectTaskRunnerAffinity) { |
while (!threads.empty()) { |
last_callback_success_ = false; |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
MemoryDumpLevelOfDetail::DETAILED); |
EXPECT_TRUE(last_callback_success_); |
@@ -566,7 +570,7 @@ TEST_F(MemoryDumpManagerTest, PostTaskForSequencedTaskRunner) { |
EXPECT_CALL(mdps[0], OnMemoryDump(_, _)).Times(0); |
EXPECT_CALL(mdps[1], OnMemoryDump(_, _)).Times(2); |
EXPECT_CALL(mdps[2], OnMemoryDump(_, _)).Times(2); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(2); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(2); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
@@ -602,7 +606,7 @@ TEST_F(MemoryDumpManagerTest, DisableFailingDumpers) { |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
const int kNumDumps = 2 * GetMaxConsecutiveFailuresCount(); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(kNumDumps); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(kNumDumps); |
EXPECT_CALL(mdp1, OnMemoryDump(_, _)) |
.Times(GetMaxConsecutiveFailuresCount()) |
@@ -634,7 +638,7 @@ TEST_F(MemoryDumpManagerTest, RegisterDumperWhileDumping) { |
RegisterDumpProvider(&mdp1, nullptr); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(4); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(4); |
EXPECT_CALL(mdp1, OnMemoryDump(_, _)) |
.Times(4) |
@@ -670,7 +674,7 @@ TEST_F(MemoryDumpManagerTest, UnregisterDumperWhileDumping) { |
RegisterDumpProvider(&mdp2, ThreadTaskRunnerHandle::Get(), kDefaultOptions); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(4); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(4); |
EXPECT_CALL(mdp1, OnMemoryDump(_, _)) |
.Times(4) |
@@ -740,7 +744,7 @@ TEST_F(MemoryDumpManagerTest, UnregisterDumperFromThreadWhileDumping) { |
last_callback_success_ = false; |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
MemoryDumpLevelOfDetail::DETAILED); |
ASSERT_EQ(1, on_memory_dump_call_count); |
@@ -802,7 +806,7 @@ TEST_F(MemoryDumpManagerTest, TestPollingOnDumpThread) { |
TraceConfigMemoryTestUtil::GetTraceConfig_PeakDetectionTrigger(3)); |
int last_poll_to_request_dump = -2; |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)) |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)) |
.Times(testing::AtLeast(2)) |
.WillRepeatedly(Invoke([&last_poll_to_request_dump, &call_count]( |
const MemoryDumpRequestArgs& args, |
@@ -861,7 +865,7 @@ TEST_F(MemoryDumpManagerTest, TearDownThreadWhileDumping) { |
last_callback_success_ = false; |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
MemoryDumpLevelOfDetail::DETAILED); |
ASSERT_EQ(1, on_memory_dump_call_count); |
@@ -877,7 +881,7 @@ TEST_F(MemoryDumpManagerTest, CallbackCalledOnFailure) { |
MockMemoryDumpProvider mdp1; |
RegisterDumpProvider(&mdp1, nullptr); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(0); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(0); |
EXPECT_CALL(mdp1, OnMemoryDump(_, _)).Times(0); |
last_callback_success_ = true; |
@@ -897,7 +901,6 @@ TEST_F(MemoryDumpManagerTest, InitializedAfterStartOfTracing) { |
// 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 +909,9 @@ TEST_F(MemoryDumpManagerTest, InitializedAfterStartOfTracing) { |
// Now late-initialize the MemoryDumpManager and check that the |
// RequestGlobalDump completes successfully. |
{ |
- EXPECT_CALL(mdp, OnMemoryDump(_, _)).Times(1); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
InitializeMemoryDumpManager(false /* is_coordinator */); |
+ EXPECT_CALL(mdp, OnMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
MemoryDumpLevelOfDetail::DETAILED); |
EXPECT_TRUE(last_callback_success_); |
@@ -922,7 +925,7 @@ TEST_F(MemoryDumpManagerTest, InitializedAfterStartOfTracing) { |
// and the new-style (JSON-based) TraceConfig. |
TEST_F(MemoryDumpManagerTest, TraceConfigExpectations) { |
InitializeMemoryDumpManager(false /* is_coordinator */); |
- MemoryDumpManagerDelegateForTesting& delegate = *delegate_; |
+ MemoryDumpManagerDelegateForTesting& delegate = *delegate_ptr_; |
// Don't trigger the default behavior of the mock delegate in this test, |
// which would short-circuit the dump request to the actual |
@@ -948,7 +951,7 @@ TEST_F(MemoryDumpManagerTest, TraceConfigExpectations) { |
TEST_F(MemoryDumpManagerTest, TraceConfigExpectationsWhenIsCoordinator) { |
InitializeMemoryDumpManager(true /* is_coordinator */); |
- MemoryDumpManagerDelegateForTesting& delegate = *delegate_; |
+ MemoryDumpManagerDelegateForTesting& delegate = *delegate_ptr_; |
ON_CALL(delegate, RequestGlobalMemoryDump(_, _)).WillByDefault(Return()); |
// Enabling memory-infra with the legacy TraceConfig (category filter) in |
@@ -1029,7 +1032,7 @@ TEST_F(MemoryDumpManagerTest, DisableTracingWhileDumping) { |
RegisterDumpProvider(&unbound_mdp, nullptr, kDefaultOptions); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
EXPECT_CALL(mdp_with_affinity, OnMemoryDump(_, _)) |
.Times(1) |
.WillOnce( |
@@ -1078,11 +1081,11 @@ TEST_F(MemoryDumpManagerTest, DisableTracingRightBeforeStartOfDump) { |
RegisterDumpProvider(&mdp2, mdp_thread->task_runner(), kDefaultOptions); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)) |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)) |
.WillOnce(Invoke([this](const MemoryDumpRequestArgs& args, |
const MemoryDumpCallback& callback) { |
DisableTracing(); |
- delegate_->CreateProcessDump(args, callback); |
+ delegate_ptr_->CreateProcessDump(args, callback); |
})); |
// If tracing is disabled for current session CreateProcessDump() should NOT |
@@ -1117,7 +1120,7 @@ TEST_F(MemoryDumpManagerTest, DumpOnBehalfOfOtherProcess) { |
RegisterDumpProvider(&mdp3, nullptr, options); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
EXPECT_CALL(mdp1, OnMemoryDump(_, _)).Times(1).WillRepeatedly(Return(true)); |
EXPECT_CALL(mdp2, OnMemoryDump(_, _)).Times(1).WillRepeatedly(Return(true)); |
EXPECT_CALL(mdp3, OnMemoryDump(_, _)).Times(1).WillRepeatedly(Return(true)); |
@@ -1211,7 +1214,7 @@ TEST_F(MemoryDumpManagerTest, UnregisterAndDeleteDumpProviderSoonDuringDump) { |
})); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(2); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(2); |
for (int i = 0; i < 2; ++i) { |
RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED, |
MemoryDumpLevelOfDetail::DETAILED); |
@@ -1230,7 +1233,7 @@ TEST_F(MemoryDumpManagerTest, TestWhitelistingMDP) { |
EXPECT_CALL(*mdp1, OnMemoryDump(_, _)).Times(0); |
EXPECT_CALL(*mdp2, OnMemoryDump(_, _)).Times(1).WillOnce(Return(true)); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(1); |
EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory); |
EXPECT_FALSE(IsPeriodicDumpingEnabled()); |
@@ -1246,14 +1249,14 @@ TEST_F(MemoryDumpManagerTest, TestBackgroundTracingSetup) { |
auto quit_closure = run_loop.QuitClosure(); |
testing::InSequence sequence; |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(IsBackgroundDump(), _)) |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(IsBackgroundDump(), _)) |
.Times(5); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(IsBackgroundDump(), _)) |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(IsBackgroundDump(), _)) |
.WillOnce(Invoke([quit_closure](const MemoryDumpRequestArgs& args, |
const MemoryDumpCallback& callback) { |
ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, quit_closure); |
})); |
- EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(AnyNumber()); |
+ EXPECT_CALL(*delegate_ptr_, RequestGlobalMemoryDump(_, _)).Times(AnyNumber()); |
EnableTracingWithTraceConfig( |
TraceConfigMemoryTestUtil::GetTraceConfig_BackgroundTrigger( |