Move zygote from //services/service_manager back to //content

This effectively reverts 668c097. Bug: 1097376 Change-Id: I6dfe3300315bbee65bcc0d18fb26a0afa46a61f6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2252466 Commit-Queue: Robert Sesek <rsesek@chromium.org> Reviewed-by: Greg Kerr <kerrnel@chromium.org> Reviewed-by: John Abd-El-Malek <jam@chromium.org> Cr-Commit-Position: refs/heads/master@{#782545}
FairyWorld · Jun 25, 2020 · 8621aef · 8621aef
1 parent 645ca14
commit 8621aef
Show file tree

Hide file tree

Showing 76 changed files with 387 additions and 401 deletions.
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
@@ -1152,8 +1152,7 @@ void ChromeMainDelegate::ProcessExiting(const std::string& process_type) {
 
 #if defined(OS_LINUX)
 void ChromeMainDelegate::ZygoteStarting(
-    std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>*
-        delegates) {
+    std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) {
 #if defined(OS_CHROMEOS)
     chromeos::InitHugepagesAndMlockSelf();
 #endif

diff --git a/chrome/app/chrome_main_delegate.h b/chrome/app/chrome_main_delegate.h
@@ -49,9 +49,8 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
       const content::MainFunctionParams& main_function_params) override;
   void ProcessExiting(const std::string& process_type) override;
 #if defined(OS_LINUX)
-  void ZygoteStarting(
-      std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>*
-          delegates) override;
+  void ZygoteStarting(std::vector<std::unique_ptr<content::ZygoteForkDelegate>>*
+                          delegates) override;
   void ZygoteForked() override;
 #endif
   service_manager::ProcessType OverrideProcessType() override;

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -4339,7 +4339,6 @@ static_library("browser") {
     if (use_x11) {
       deps += [ "//ui/gfx/x" ]
     }
-    deps += [ "//services/service_manager/zygote" ]
   }
 
   if (is_chromeos) {

diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
@@ -39,7 +39,7 @@
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-#include "services/service_manager/zygote/zygote_host_linux.h"
+#include "content/public/browser/zygote_host/zygote_host_linux.h"
 #endif
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -340,7 +340,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
     }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-    if (service_manager::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) {
+    if (content::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) {
       process.process_type = content::PROCESS_TYPE_ZYGOTE;
     }
 #endif

diff --git a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.cc b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.cc
@@ -49,7 +49,6 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/common/content_constants.h"
-#include "services/service_manager/zygote/zygote_host_linux.h"
 #include "ui/wm/public/activation_client.h"
 
 using base::ProcessHandle;

diff --git a/chrome/browser/ui/webui/sandbox/sandbox_internals_ui.cc b/chrome/browser/ui/webui/sandbox/sandbox_internals_ui.cc
@@ -25,8 +25,8 @@
 #endif
 
 #if defined(OS_LINUX)
+#include "content/public/browser/zygote_host/zygote_host_linux.h"
 #include "services/service_manager/sandbox/sandbox.h"
-#include "services/service_manager/zygote/zygote_host_linux.h"
 #endif
 
 namespace {
@@ -35,7 +35,7 @@ namespace {
 static void SetSandboxStatusData(content::WebUIDataSource* source) {
   // Get expected sandboxing status of renderers.
   const int status =
-      service_manager::ZygoteHost::GetInstance()->GetRendererSandboxStatus();
+      content::ZygoteHost::GetInstance()->GetRendererSandboxStatus();
 
   source->AddBoolean("suid", status & service_manager::SandboxLinux::kSUID);
   source->AddBoolean("userNs", status & service_manager::SandboxLinux::kUserNS);

diff --git a/components/nacl/broker/BUILD.gn b/components/nacl/broker/BUILD.gn
@@ -26,12 +26,12 @@ source_set("broker") {
     "//components/nacl/common:minimal",
     "//components/nacl/common:switches",
     "//content/public/common:static_switches",
+    "//content/public/common/zygote:buildflags",
     "//ipc",
     "//mojo/public/cpp/platform",
     "//mojo/public/cpp/system",
     "//sandbox",
     "//services/service_manager/public/cpp",
-    "//services/service_manager/zygote:zygote_buildflags",
   ]
 
   if (current_cpu == target_cpu) {
@@ -137,9 +137,9 @@ if (current_cpu == "x86") {
     deps = [
       "//base",
       "//content/public/common:static_switches",
+      "//content/public/common/zygote:buildflags",
       "//sandbox",
       "//services/service_manager/sandbox",
-      "//services/service_manager/zygote:zygote_buildflags",
     ]
   }
 

diff --git a/components/nacl/browser/BUILD.gn b/components/nacl/browser/BUILD.gn
@@ -44,7 +44,6 @@ static_library("browser") {
     "//ppapi/host",
     "//ppapi/proxy:ipc",
     "//ppapi/shared_impl",
-    "//services/service_manager/zygote:zygote_buildflags",
   ]
 
   public_deps = [
@@ -64,7 +63,6 @@ static_library("browser") {
       "//components/nacl/loader:nacl_helper_integration",
       "//sandbox/linux:sandbox_services",
       "//sandbox/linux:suid_sandbox_client",
-      "//services/service_manager/zygote",
     ]
 
     if (enable_nacl_nonsfi) {

diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
@@ -54,6 +54,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/process_type.h"
 #include "content/public/common/sandboxed_process_launcher_delegate.h"
+#include "content/public/common/zygote/zygote_buildflags.h"
 #include "ipc/ipc_channel.h"
 #include "mojo/public/cpp/system/invitation.h"
 #include "net/socket/socket_descriptor.h"
@@ -63,10 +64,9 @@
 #include "ppapi/shared_impl/ppapi_constants.h"
 #include "ppapi/shared_impl/ppapi_nacl_plugin_args.h"
 #include "services/service_manager/sandbox/switches.h"
-#include "services/service_manager/zygote/common/zygote_buildflags.h"
 
 #if BUILDFLAG(USE_ZYGOTE_HANDLE)
-#include "services/service_manager/zygote/common/zygote_handle.h"  // nogncheck
+#include "content/public/common/zygote/zygote_handle.h"  // nogncheck
 #endif  // BUILDFLAG(USE_ZYGOTE_HANDLE)
 
 #if defined(OS_POSIX)
@@ -185,8 +185,8 @@ class NaClSandboxedProcessLauncherDelegate
 #endif  // OS_WIN
 
 #if BUILDFLAG(USE_ZYGOTE_HANDLE)
-  service_manager::ZygoteHandle GetZygote() override {
-    return service_manager::GetGenericZygote();
+  content::ZygoteHandle GetZygote() override {
+    return content::GetGenericZygote();
   }
 #endif  // BUILDFLAG(USE_ZYGOTE_HANDLE)
 

diff --git a/components/nacl/loader/BUILD.gn b/components/nacl/loader/BUILD.gn
@@ -43,10 +43,6 @@ source_set("minimal") {
     "//sandbox",
     "//services/service_manager/public/cpp",
   ]
-
-  if (is_linux) {
-    deps += [ "//services/service_manager/zygote" ]
-  }
 }
 
 # This exists just to make 'gn check' happy with :minimal and
@@ -56,9 +52,9 @@ source_set("minimal") {
 source_set("minimal_content_dummy") {
   check_includes = false
   sources = [
-    "//content/public/common/common_sandbox_support_linux.h",
     "//content/public/common/main_function_params.h",
     "//content/public/common/sandbox_init.h",
+    "//content/public/common/zygote/sandbox_support_linux.h",
   ]
 
   # Deps required by the above headers.
@@ -128,7 +124,6 @@ if (is_linux) {
       "//mojo/core/embedder",
       "//sandbox/linux:sandbox_services",
       "//services/service_manager/sandbox",
-      "//services/service_manager/zygote",
       "//url/ipc:url_ipc",
     ]
 
@@ -241,7 +236,6 @@ if (is_nacl_nonsfi) {
       "//sandbox/linux:sandbox",
       "//services/service_manager/public/cpp",
       "//services/service_manager/sandbox",
-      "//services/service_manager/zygote:zygote_util",
     ]
   }
 

diff --git a/components/nacl/loader/nacl_helper_linux.cc b/components/nacl/loader/nacl_helper_linux.cc
@@ -36,13 +36,13 @@
 #include "build/build_config.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/nacl/loader/sandbox_linux/nacl_sandbox_linux.h"
+#include "content/public/common/zygote/send_zygote_child_ping_linux.h"
+#include "content/public/common/zygote/zygote_fork_delegate_linux.h"
 #include "mojo/core/embedder/embedder.h"
 #include "sandbox/linux/services/credentials.h"
 #include "sandbox/linux/services/namespace_sandbox.h"
 #include "services/service_manager/embedder/descriptors.h"
 #include "services/service_manager/embedder/switches.h"
-#include "services/service_manager/zygote/common/send_zygote_child_ping_linux.h"
-#include "services/service_manager/zygote/common/zygote_fork_delegate_linux.h"
 
 #if defined(OS_NACL_NONSFI)
 #include "components/nacl/loader/nonsfi/nonsfi_listener.h"
@@ -144,16 +144,16 @@ void ChildNaClLoaderInit(std::vector<base::ScopedFD> child_fds,
                          nacl::NaClSandbox* nacl_sandbox,
                          const std::string& channel_id) {
   DCHECK(child_fds.size() >
-         std::max(service_manager::ZygoteForkDelegate::kPIDOracleFDIndex,
-                  service_manager::ZygoteForkDelegate::kBrowserFDIndex));
+         std::max(content::ZygoteForkDelegate::kPIDOracleFDIndex,
+                  content::ZygoteForkDelegate::kBrowserFDIndex));
 
   // Ping the PID oracle socket.
-  CHECK(service_manager::SendZygoteChildPing(
-      child_fds[service_manager::ZygoteForkDelegate::kPIDOracleFDIndex].get()));
+  CHECK(content::SendZygoteChildPing(
+      child_fds[content::ZygoteForkDelegate::kPIDOracleFDIndex].get()));
 
   // Save the browser socket and close the rest.
-  base::ScopedFD browser_fd(std::move(
-      child_fds[service_manager::ZygoteForkDelegate::kBrowserFDIndex]));
+  base::ScopedFD browser_fd(
+      std::move(child_fds[content::ZygoteForkDelegate::kBrowserFDIndex]));
   child_fds.clear();
 
   BecomeNaClLoader(std::move(browser_fd), system_info, uses_nonsfi_mode,
@@ -181,7 +181,7 @@ bool HandleForkRequest(std::vector<base::ScopedFD> child_fds,
     return false;
   }
 
-  if (service_manager::ZygoteForkDelegate::kNumPassedFDs != child_fds.size()) {
+  if (content::ZygoteForkDelegate::kNumPassedFDs != child_fds.size()) {
     LOG(ERROR) << "nacl_helper: unexpected number of fds, got "
         << child_fds.size();
     return false;

diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc
@@ -42,7 +42,7 @@
 #include "native_client/src/public/nacl_desc.h"
 
 #if defined(OS_LINUX)
-#include "services/service_manager/zygote/common/common_sandbox_support_linux.h"
+#include "content/public/common/zygote/sandbox_support_linux.h"
 #endif
 
 #if defined(OS_POSIX)
@@ -229,8 +229,8 @@ void NaClListener::Listen() {
 #if defined(OS_LINUX)
 // static
 int NaClListener::MakeSharedMemorySegment(size_t length, int executable) {
-  return service_manager::SharedMemoryIPCSupport::MakeSharedMemorySegment(
-      length, executable);
+  return content::SharedMemoryIPCSupport::MakeSharedMemorySegment(length,
+                                                                  executable);
 }
 #endif
 

diff --git a/components/nacl/zygote/nacl_fork_delegate_linux.cc b/components/nacl/zygote/nacl_fork_delegate_linux.cc
@@ -130,8 +130,7 @@ bool SendIPCRequestAndReadReply(int ipc_channel,
 namespace nacl {
 
 void AddNaClZygoteForkDelegates(
-    std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>*
-        delegates) {
+    std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) {
   delegates->push_back(
       std::make_unique<NaClForkDelegate>(false /* nonsfi_mode */));
   delegates->push_back(

diff --git a/components/nacl/zygote/nacl_fork_delegate_linux.h b/components/nacl/zygote/nacl_fork_delegate_linux.h
@@ -12,7 +12,7 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "services/service_manager/zygote/common/zygote_fork_delegate_linux.h"
+#include "content/public/common/zygote/zygote_fork_delegate_linux.h"
 
 namespace base {
 struct LaunchOptions;
@@ -22,15 +22,14 @@ namespace nacl {
 
 // Appends any ZygoteForkDelegate instances needed by NaCl to |*delegates|.
 void AddNaClZygoteForkDelegates(
-    std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>*
-        delegates);
+    std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates);
 
 // The NaClForkDelegate is created during Chrome linux zygote initialization,
 // and provides "fork()" functionality with NaCl specific process
 // characteristics (specifically address space layout) as an alternative to
 // forking the zygote. A new delegate is passed in as an argument to
 // ZygoteMain().
-class NaClForkDelegate : public service_manager::ZygoteForkDelegate {
+class NaClForkDelegate : public content::ZygoteForkDelegate {
  public:
   explicit NaClForkDelegate(bool nonsfi_mode);
   ~NaClForkDelegate() override;

diff --git a/content/BUILD.gn b/content/BUILD.gn
@@ -90,6 +90,7 @@ if (is_component_build) {
     sources = [
       "//services/service_manager/sandbox/linux/sandbox_seccomp_bpf_linux.cc",
       "common/sandbox_init_linux.cc",
+      "common/zygote/send_zygote_child_ping_linux.cc",
       "public/common/content_switches.cc",
       "public/common/content_switches.h",
     ]

diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
@@ -82,6 +82,7 @@ source_set("content_main_runner_app") {
            "//content/public/utility:utility_sources",
            "//content/renderer",
            "//content/utility",
+           "//content/zygote",
          ]
 }