| 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 9835415f4e7ff0305c5c08d7a1a41e5aaab413c9..bff6b2d40548c4911208f904b5bc5e6937152125 100644
|
| --- a/base/trace_event/memory_dump_manager_unittest.cc
|
| +++ b/base/trace_event/memory_dump_manager_unittest.cc
|
| @@ -70,8 +70,6 @@ class MemoryDumpManagerTest : public testing::Test {
|
| }
|
|
|
| protected:
|
| - const char* kTraceCategory = MemoryDumpManager::kTraceCategoryForTesting;
|
| -
|
| void EnableTracing(const char* category) {
|
| TraceLog::GetInstance()->SetEnabled(
|
| TraceConfig(category, ""), TraceLog::RECORDING_MODE);
|
| @@ -175,7 +173,7 @@ TEST_F(MemoryDumpManagerTest, SingleDumper) {
|
|
|
| // Now repeat enabling the memory category and check that the dumper is
|
| // invoked this time.
|
| - EnableTracing(kTraceCategory);
|
| + EnableTracing(MemoryDumpManager::kTraceCategory);
|
| EXPECT_CALL(mdp, OnMemoryDump(_, _)).Times(3).WillRepeatedly(Return(true));
|
| for (int i = 0; i < 3; ++i)
|
| mdm_->RequestGlobalDump(MemoryDumpType::EXPLICITLY_TRIGGERED,
|
| @@ -185,7 +183,7 @@ TEST_F(MemoryDumpManagerTest, SingleDumper) {
|
| mdm_->UnregisterDumpProvider(&mdp);
|
|
|
| // Finally check the unregister logic (no calls to the mdp after unregister).
|
| - EnableTracing(kTraceCategory);
|
| + EnableTracing(MemoryDumpManager::kTraceCategory);
|
| EXPECT_CALL(mdp, OnMemoryDump(_, _)).Times(0);
|
| mdm_->RequestGlobalDump(MemoryDumpType::EXPLICITLY_TRIGGERED,
|
| high_detail_args);
|
| @@ -198,7 +196,7 @@ TEST_F(MemoryDumpManagerTest, CheckMemoryDumpArgs) {
|
| MockDumpProvider mdp_high_detail(MemoryDumpArgs::LevelOfDetail::HIGH);
|
| mdm_->RegisterDumpProvider(&mdp_high_detail);
|
|
|
| - EnableTracing(kTraceCategory);
|
| + EnableTracing(MemoryDumpManager::kTraceCategory);
|
| EXPECT_CALL(mdp_high_detail, OnMemoryDump(_, _))
|
| .Times(1)
|
| .WillRepeatedly(
|
| @@ -214,7 +212,7 @@ TEST_F(MemoryDumpManagerTest, CheckMemoryDumpArgs) {
|
| MockDumpProvider mdp_low_detail(MemoryDumpArgs::LevelOfDetail::LOW);
|
| mdm_->RegisterDumpProvider(&mdp_low_detail);
|
|
|
| - EnableTracing(kTraceCategory);
|
| + EnableTracing(MemoryDumpManager::kTraceCategory);
|
| EXPECT_CALL(mdp_low_detail, OnMemoryDump(_, _))
|
| .Times(1)
|
| .WillRepeatedly(
|
| @@ -232,7 +230,7 @@ TEST_F(MemoryDumpManagerTest, SharedSessionState) {
|
| mdm_->RegisterDumpProvider(&mdp1);
|
| mdm_->RegisterDumpProvider(&mdp2);
|
|
|
| - EnableTracing(kTraceCategory);
|
| + EnableTracing(MemoryDumpManager::kTraceCategory);
|
| EXPECT_CALL(mdp1, OnMemoryDump(_, _))
|
| .Times(2)
|
| .WillRepeatedly(
|
| @@ -255,7 +253,7 @@ TEST_F(MemoryDumpManagerTest, MultipleDumpers) {
|
|
|
| // Enable only mdp1.
|
| mdm_->RegisterDumpProvider(&mdp1);
|
| - EnableTracing(kTraceCategory);
|
| + EnableTracing(MemoryDumpManager::kTraceCategory);
|
| EXPECT_CALL(mdp1, OnMemoryDump(_, _)).Times(1).WillRepeatedly(Return(true));
|
| EXPECT_CALL(mdp2, OnMemoryDump(_, _)).Times(0);
|
| mdm_->RequestGlobalDump(MemoryDumpType::EXPLICITLY_TRIGGERED,
|
| @@ -265,7 +263,7 @@ TEST_F(MemoryDumpManagerTest, MultipleDumpers) {
|
| // Invert: enable mdp1 and disable mdp2.
|
| mdm_->UnregisterDumpProvider(&mdp1);
|
| mdm_->RegisterDumpProvider(&mdp2);
|
| - EnableTracing(kTraceCategory);
|
| + EnableTracing(MemoryDumpManager::kTraceCategory);
|
| EXPECT_CALL(mdp1, OnMemoryDump(_, _)).Times(0);
|
| EXPECT_CALL(mdp2, OnMemoryDump(_, _)).Times(1).WillRepeatedly(Return(true));
|
| mdm_->RequestGlobalDump(MemoryDumpType::EXPLICITLY_TRIGGERED,
|
| @@ -274,7 +272,7 @@ TEST_F(MemoryDumpManagerTest, MultipleDumpers) {
|
|
|
| // Enable both mdp1 and mdp2.
|
| mdm_->RegisterDumpProvider(&mdp1);
|
| - EnableTracing(kTraceCategory);
|
| + EnableTracing(MemoryDumpManager::kTraceCategory);
|
| EXPECT_CALL(mdp1, OnMemoryDump(_, _)).Times(1).WillRepeatedly(Return(true));
|
| EXPECT_CALL(mdp2, OnMemoryDump(_, _)).Times(1).WillRepeatedly(Return(true));
|
| mdm_->RequestGlobalDump(MemoryDumpType::EXPLICITLY_TRIGGERED,
|
| @@ -307,7 +305,7 @@ TEST_F(MemoryDumpManagerTest, RespectTaskRunnerAffinity) {
|
| Invoke(mdp, &MockDumpProvider::OnMemoryDump_CheckTaskRunner));
|
| }
|
|
|
| - EnableTracing(kTraceCategory);
|
| + EnableTracing(MemoryDumpManager::kTraceCategory);
|
|
|
| while (!threads.empty()) {
|
| last_callback_success_ = false;
|
| @@ -352,7 +350,7 @@ TEST_F(MemoryDumpManagerTest, DisableFailingDumpers) {
|
|
|
| mdm_->RegisterDumpProvider(&mdp1);
|
| mdm_->RegisterDumpProvider(&mdp2);
|
| - EnableTracing(kTraceCategory);
|
| + EnableTracing(MemoryDumpManager::kTraceCategory);
|
|
|
| EXPECT_CALL(mdp1, OnMemoryDump(_, _))
|
| .Times(MemoryDumpManager::kMaxConsecutiveFailuresCount)
|
| @@ -379,7 +377,7 @@ TEST_F(MemoryDumpManagerTest, RegisterDumperWhileDumping) {
|
|
|
| mdp1.dump_provider_to_register_or_unregister = &mdp2;
|
| mdm_->RegisterDumpProvider(&mdp1);
|
| - EnableTracing(kTraceCategory);
|
| + EnableTracing(MemoryDumpManager::kTraceCategory);
|
|
|
| EXPECT_CALL(mdp1, OnMemoryDump(_, _))
|
| .Times(4)
|
| @@ -410,7 +408,7 @@ TEST_F(MemoryDumpManagerTest, UnregisterDumperWhileDumping) {
|
| mdm_->RegisterDumpProvider(&mdp1, ThreadTaskRunnerHandle::Get());
|
| mdm_->RegisterDumpProvider(&mdp2, ThreadTaskRunnerHandle::Get());
|
| mdp1.dump_provider_to_register_or_unregister = &mdp2;
|
| - EnableTracing(kTraceCategory);
|
| + EnableTracing(MemoryDumpManager::kTraceCategory);
|
|
|
| EXPECT_CALL(mdp1, OnMemoryDump(_, _))
|
| .Times(4)
|
|
|