Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: content/browser/tracing/memory_tracing_browsertest.cc

Issue 1308403002: [Tracing] Disable registration of regular dump providers during tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@reland-content-browsertest
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/tracing/memory_tracing_browsertest.cc
diff --git a/content/browser/tracing/memory_tracing_browsertest.cc b/content/browser/tracing/memory_tracing_browsertest.cc
index 3b72e90da6f06bebe17193a23d2a2567689007b2..078e54c626c0eb106680313033dbd1bd631020d4 100644
--- a/content/browser/tracing/memory_tracing_browsertest.cc
+++ b/content/browser/tracing/memory_tracing_browsertest.cc
@@ -68,10 +68,12 @@ class MemoryTracingTest : public ContentBrowserTest {
callback_call_count_ = 0;
last_callback_dump_guid_ = 0;
last_callback_success_ = false;
- MemoryDumpManager::GetInstance()->Initialize();
mock_dump_provider_.reset(new MockDumpProvider());
MemoryDumpManager::GetInstance()->RegisterDumpProvider(
mock_dump_provider_.get());
+ MemoryDumpManager::GetInstance()->set_ignore_registrations_for_testing(
+ true);
+ MemoryDumpManager::GetInstance()->Initialize();
// TODO(primiano): This should be done via TraceConfig.
// See https://goo.gl/5Hj3o0.
MemoryDumpManager::GetInstance()->DisablePeriodicDumpsForTesting();

Powered by Google App Engine
This is Rietveld 408576698