Index: content/zygote/zygote_linux.cc |
diff --git a/content/zygote/zygote_linux.cc b/content/zygote/zygote_linux.cc |
index 3fdcd8f4498516cbc9b13850803a97dc89e6d498..81f21c1b4055018ee3dbac615704bd8d821b3123 100644 |
--- a/content/zygote/zygote_linux.cc |
+++ b/content/zygote/zygote_linux.cc |
@@ -33,6 +33,7 @@ |
#include "base/trace_event/trace_event.h" |
#include "build/build_config.h" |
#include "content/common/sandbox_linux/sandbox_linux.h" |
+#include "content/common/set_process_title.h" |
#include "content/common/zygote_commands_linux.h" |
#include "content/public/common/content_descriptors.h" |
#include "content/public/common/mojo_channel_switches.h" |
@@ -43,7 +44,6 @@ |
#include "ipc/ipc_channel.h" |
#include "sandbox/linux/services/credentials.h" |
#include "sandbox/linux/services/namespace_sandbox.h" |
-#include "services/service_manager/embedder/set_process_title.h" |
// See https://chromium.googlesource.com/chromium/src/+/master/docs/linux_zygote.md |
@@ -621,7 +621,7 @@ |
// Update the process title. The argv was already cached by the call to |
// SetProcessTitleFromCommandLine in ChromeMain, so we can pass NULL here |
// (we don't have the original argv at this point). |
- service_manager::SetProcessTitleFromCommandLine(nullptr); |
+ SetProcessTitleFromCommandLine(NULL); |
} else if (child_pid < 0) { |
LOG(ERROR) << "Zygote could not fork: process_type " << process_type |
<< " numfds " << numfds << " child_pid " << child_pid; |