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

Unified Diff: content/child/child_thread_impl.cc

Issue 2741203002: memory-infra: Finish moving to Mojo (3nd attempt) (Closed)
Patch Set: rebase Created 3 years, 9 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/child/DEPS ('k') | content/common/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index 071b20f02d3aab5ec52fc2742d718aa3a11e1f52..458604f431af855cc781862bbec924b85e2ad701 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -31,6 +31,7 @@
#include "base/threading/thread_local.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/timer/elapsed_timer.h"
+#include "base/trace_event/memory_dump_manager.h"
#include "base/tracked_objects.h"
#include "build/build_config.h"
#include "components/tracing/child/child_trace_message_filter.h"
@@ -66,6 +67,7 @@
#include "mojo/public/cpp/system/platform_handle.h"
#include "services/device/public/cpp/power_monitor/power_monitor_broadcast_source.h"
#include "services/device/public/interfaces/constants.mojom.h"
+#include "services/resource_coordinator/public/cpp/memory/memory_dump_manager_delegate_impl.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/interface_factory.h"
#include "services/service_manager/public/cpp/interface_provider.h"
@@ -503,6 +505,14 @@ void ChildThreadImpl::Init(const Options& options) {
channel_->AddFilter(new tracing::ChildTraceMessageFilter(
ChildProcess::current()->io_task_runner()));
channel_->AddFilter(new ChildMemoryMessageFilter());
+
+ memory_instrumentation::MemoryDumpManagerDelegateImpl::Config config(
+ GetRemoteInterfaces());
+ auto delegate =
+ base::MakeUnique<memory_instrumentation::MemoryDumpManagerDelegateImpl>(
+ config);
+ base::trace_event::MemoryDumpManager::GetInstance()->Initialize(
+ std::move(delegate));
}
// In single process mode we may already have a power monitor,
« no previous file with comments | « content/child/DEPS ('k') | content/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698