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

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

Issue 1333873002: [tracing] Fix MemoryDumpManager to support startup tracing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re dsinclair #5 (nits, invert Initialize args) Created 5 years, 3 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
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/tracing/tracing_controller_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 90ddb5bf3b9e121a4b025dde3850f01a246bca86..8b0a1a9e8ebc066347ae82c3115e1541f3db077c 100644
--- a/content/browser/tracing/memory_tracing_browsertest.cc
+++ b/content/browser/tracing/memory_tracing_browsertest.cc
@@ -68,13 +68,14 @@ 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());
+
// TODO(primiano): This should be done via TraceConfig.
// See https://goo.gl/5Hj3o0.
MemoryDumpManager::GetInstance()->DisablePeriodicDumpsForTesting();
+
+ mock_dump_provider_.reset(new MockDumpProvider());
+ MemoryDumpManager::GetInstance()->RegisterDumpProvider(
+ mock_dump_provider_.get());
ContentBrowserTest::SetUp();
}
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/tracing/tracing_controller_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698