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

Unified Diff: content/browser/browser_main.cc

Issue 2694083005: memory-infra: Finish moving memory_infra from TracingController (Closed)
Patch Set: style: auto must not deduce to raw pointer Created 3 years, 10 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/browser_main.cc
diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc
index 772010cf709ea1870d6e469fe6987e40d485cdd6..5625a020b4c9156037e6cacf9a1c6ac9a2c89b41 100644
--- a/content/browser/browser_main.cc
+++ b/content/browser/browser_main.cc
@@ -6,7 +6,9 @@
#include <memory>
+#include "base/trace_event/memory_dump_manager.h"
#include "base/trace_event/trace_event.h"
+#include "content/common/child_process_host_impl.h"
#include "content/common/content_constants_internal.h"
#include "content/public/browser/browser_main_runner.h"
@@ -36,7 +38,8 @@ int BrowserMain(const MainFunctionParams& parameters) {
base::trace_event::TraceLog::GetInstance()->SetProcessName("Browser");
base::trace_event::TraceLog::GetInstance()->SetProcessSortIndex(
kTraceEventBrowserProcessSortIndex);
-
+ base::trace_event::MemoryDumpManager::GetInstance()->set_tracing_process_id(
+ ChildProcessHost::kBrowserTracingProcessId);
std::unique_ptr<BrowserMainRunner> main_runner(BrowserMainRunner::Create());
int exit_code = main_runner->Initialize(parameters);

Powered by Google App Engine
This is Rietveld 408576698