| 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 c1295efac653e66ad9ee6c50c80183f792ed3dd6..af33718cc53a983cbb54aecd4fae427237a87a91 100644
|
| --- a/base/trace_event/memory_dump_manager_unittest.cc
|
| +++ b/base/trace_event/memory_dump_manager_unittest.cc
|
| @@ -48,19 +48,33 @@ MATCHER(IsLightDump, "") {
|
| return arg.level_of_detail == MemoryDumpLevelOfDetail::LIGHT;
|
| }
|
|
|
| +MATCHER(IsBackgroundDump, "") {
|
| + return arg.level_of_detail == MemoryDumpLevelOfDetail::BACKGROUND;
|
| +}
|
| +
|
| namespace {
|
|
|
| +const char* kMDPName = "TestDumpProvider";
|
| +const char* kWhitelistedMDPName = "WhitelistedTestDumpProvider";
|
| +
|
| void RegisterDumpProvider(
|
| MemoryDumpProvider* mdp,
|
| + const char* name,
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| const MemoryDumpProvider::Options& options) {
|
| MemoryDumpManager* mdm = MemoryDumpManager::GetInstance();
|
| mdm->set_dumper_registrations_ignored_for_testing(false);
|
| - const char* kMDPName = "TestDumpProvider";
|
| - mdm->RegisterDumpProvider(mdp, kMDPName, std::move(task_runner), options);
|
| + mdm->RegisterDumpProvider(mdp, name, std::move(task_runner), options);
|
| mdm->set_dumper_registrations_ignored_for_testing(true);
|
| }
|
|
|
| +void RegisterDumpProvider(
|
| + MemoryDumpProvider* mdp,
|
| + scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| + const MemoryDumpProvider::Options& options) {
|
| + RegisterDumpProvider(mdp, kMDPName, task_runner, options);
|
| +}
|
| +
|
| void RegisterDumpProvider(MemoryDumpProvider* mdp) {
|
| RegisterDumpProvider(mdp, nullptr, MemoryDumpProvider::Options());
|
| }
|
| @@ -71,7 +85,6 @@ void RegisterDumpProviderWithSequencedTaskRunner(
|
| const MemoryDumpProvider::Options& options) {
|
| MemoryDumpManager* mdm = MemoryDumpManager::GetInstance();
|
| mdm->set_dumper_registrations_ignored_for_testing(false);
|
| - const char* kMDPName = "TestDumpProvider";
|
| mdm->RegisterDumpProviderWithSequencedTaskRunner(mdp, kMDPName, task_runner,
|
| options);
|
| mdm->set_dumper_registrations_ignored_for_testing(true);
|
| @@ -236,7 +249,7 @@ class MemoryDumpManagerTest : public testing::Test {
|
| void DisableTracing() { TraceLog::GetInstance()->SetDisabled(); }
|
|
|
| bool IsPeriodicDumpingEnabled() const {
|
| - return mdm_->periodic_dump_timer_.IsRunning();
|
| + return mdm_->periodic_dump_helper_.get();
|
| }
|
|
|
| int GetMaxConsecutiveFailuresCount() const {
|
| @@ -1099,5 +1112,47 @@ TEST_F(MemoryDumpManagerTest, UnregisterAndDeleteDumpProviderSoonDuringDump) {
|
| DisableTracing();
|
| }
|
|
|
| +TEST_F(MemoryDumpManagerTest, TestWhitelistingMDP) {
|
| + InitializeMemoryDumpManager(false /* is_coordinator */);
|
| + std::unique_ptr<MockMemoryDumpProvider> mdp1(new MockMemoryDumpProvider);
|
| + RegisterDumpProvider(mdp1.get());
|
| + std::unique_ptr<MockMemoryDumpProvider> mdp2(new MockMemoryDumpProvider);
|
| + RegisterDumpProvider(mdp2.get(), kWhitelistedMDPName, nullptr,
|
| + kDefaultOptions);
|
| +
|
| + EXPECT_CALL(*mdp1, OnMemoryDump(_, _)).Times(0);
|
| + EXPECT_CALL(*mdp2, OnMemoryDump(_, _)).Times(1).WillOnce(Return(true));
|
| + EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(_, _)).Times(1);
|
| +
|
| + EnableTracingWithLegacyCategories(MemoryDumpManager::kTraceCategory);
|
| + EXPECT_FALSE(IsPeriodicDumpingEnabled());
|
| + RequestGlobalDumpAndWait(MemoryDumpType::EXPLICITLY_TRIGGERED,
|
| + MemoryDumpLevelOfDetail::BACKGROUND);
|
| + DisableTracing();
|
| +}
|
| +
|
| +TEST_F(MemoryDumpManagerTest, TestBackgroundTracingSetup) {
|
| + InitializeMemoryDumpManager(true /* is_coordinator */);
|
| +
|
| + RunLoop run_loop;
|
| + auto quit_closure = run_loop.QuitClosure();
|
| +
|
| + testing::InSequence sequence;
|
| + EXPECT_CALL(*delegate_, RequestGlobalMemoryDump(IsBackgroundDump(), _))
|
| + .Times(5);
|
| + EXPECT_CALL(*delegate_, 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());
|
| +
|
| + EnableTracingWithTraceConfig(
|
| + TraceConfigMemoryTestUtil::GetTraceConfig_BackgroundTrigger());
|
| + ASSERT_TRUE(IsPeriodicDumpingEnabled());
|
| + run_loop.Run();
|
| + DisableTracing();
|
| +}
|
| +
|
| } // namespace trace_event
|
| } // namespace base
|
|
|