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

Unified Diff: services/resource_coordinator/memory/coordinator/coordinator_impl.cc

Issue 2820433005: memory-infra: Start disentangling tracing from memory-infra (Closed)
Patch Set: Created 3 years, 8 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: services/resource_coordinator/memory/coordinator/coordinator_impl.cc
diff --git a/services/resource_coordinator/memory/coordinator/coordinator_impl.cc b/services/resource_coordinator/memory/coordinator/coordinator_impl.cc
index e3c2551159ce2a02926881f1d085aaeb804fd5d0..e62df8c266302291a743a7972614b0414349e4f1 100644
--- a/services/resource_coordinator/memory/coordinator/coordinator_impl.cc
+++ b/services/resource_coordinator/memory/coordinator/coordinator_impl.cc
@@ -13,10 +13,14 @@
#include "base/threading/platform_thread.h"
#include "base/trace_event/memory_dump_manager.h"
#include "base/trace_event/memory_dump_request_args.h"
+#include "base/trace_event/memory_tracing_frontend.h"
#include "services/resource_coordinator/public/cpp/memory/memory_dump_manager_delegate_impl.h"
#include "services/resource_coordinator/public/interfaces/memory/constants.mojom.h"
#include "services/resource_coordinator/public/interfaces/memory/memory_instrumentation.mojom.h"
+using base::trace_event::MemoryDumpManager;
+using base::trace_event::MemoryTracingFrontend;
+
namespace {
memory_instrumentation::CoordinatorImpl* g_coordinator_impl;
@@ -36,10 +40,10 @@ CoordinatorImpl::CoordinatorImpl(bool initialize_memory_dump_manager)
if (initialize_memory_dump_manager) {
MemoryDumpManagerDelegateImpl::Config config(this);
auto delegate = base::MakeUnique<MemoryDumpManagerDelegateImpl>(config);
- base::trace_event::MemoryDumpManager::GetInstance()->set_tracing_process_id(
+ MemoryDumpManager::GetInstance()->set_tracing_process_id(
mojom::kServiceTracingProcessId);
- base::trace_event::MemoryDumpManager::GetInstance()->Initialize(
- std::move(delegate));
+ MemoryDumpManager::GetInstance()->Initialize(std::move(delegate));
+ MemoryTracingFrontend::Initialize(MemoryDumpManager::GetInstance());
ssid 2017/04/14 23:33:09 Doesn't look like the right place for initializing
hjd 2017/04/19 09:54:56 Moved to be done in MDM init.
}
g_coordinator_impl = this;
}

Powered by Google App Engine
This is Rietveld 408576698