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

Unified Diff: content/browser/tracing/tracing_controller_impl.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/tracing/tracing_controller_impl.h ('k') | content/child/child_thread_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tracing/tracing_controller_impl.cc
diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc
index d69cab97c67ff019d590ba34dc0cb10e7a167613..708841bf40ef443babf4ed01f05a49627f97e41d 100644
--- a/content/browser/tracing/tracing_controller_impl.cc
+++ b/content/browser/tracing/tracing_controller_impl.cc
@@ -59,7 +59,8 @@ TracingControllerImpl::TracingControllerImpl()
is_recording_(TraceLog::GetInstance()->IsEnabled()),
is_monitoring_(false),
is_power_tracing_(false) {
- base::trace_event::MemoryDumpManager::GetInstance()->SetDelegate(this);
+ base::trace_event::MemoryDumpManager::GetInstance()->Initialize(
+ this /* delegate */, true /* is_coordinator */);
// Deliberately leaked, like this class.
base::FileTracing::SetProvider(new FileTracingProviderImpl);
@@ -846,10 +847,6 @@ void TracingControllerImpl::RequestGlobalMemoryDump(
tmf->SendProcessMemoryDumpRequest(args);
}
-bool TracingControllerImpl::IsCoordinatorProcess() const {
- return true;
-}
-
uint64 TracingControllerImpl::GetTracingProcessId() const {
return ChildProcessHost::kBrowserTracingProcessId;
}
« no previous file with comments | « content/browser/tracing/tracing_controller_impl.h ('k') | content/child/child_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698