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

Unified Diff: content/common/child_process_host_impl.cc

Issue 2738093003: Revert of memory-infra: Finish moving to Mojo (2nd attempt) (Closed)
Patch Set: 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/common/child_process_host_impl.h ('k') | content/public/app/mojo/content_browser_manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/child_process_host_impl.cc
diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc
index 7e8e4203ad32da4ae8803f5547de588aba6da242..082906f5b6f48f77e40e524c4236c98af6cc10e8 100644
--- a/content/common/child_process_host_impl.cc
+++ b/content/common/child_process_host_impl.cc
@@ -32,7 +32,6 @@
#include "ipc/ipc_logging.h"
#include "ipc/message_filter.h"
#include "mojo/edk/embedder/embedder.h"
-#include "services/resource_coordinator/public/interfaces/memory/constants.mojom.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#if defined(OS_LINUX)
@@ -51,6 +50,9 @@
namespace content {
int ChildProcessHost::kInvalidUniqueID = -1;
+
+uint64_t ChildProcessHost::kBrowserTracingProcessId =
+ std::numeric_limits<uint64_t>::max();
// static
ChildProcessHost* ChildProcessHost::Create(ChildProcessHostDelegate* delegate) {
@@ -203,7 +205,7 @@
// tracing process ids.
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSingleProcess))
- return memory_instrumentation::mojom::kServiceTracingProcessId;
+ return ChildProcessHost::kBrowserTracingProcessId;
// The hash value is incremented so that the tracing id is never equal to
// MemoryDumpManager::kInvalidTracingProcessId.
« no previous file with comments | « content/common/child_process_host_impl.h ('k') | content/public/app/mojo/content_browser_manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698