Fuchsia: Moved SandboxPolicyFuchsia to service/service_manager/sandbox

This will allow to reuse the class in //webrunner when starting context
process.

Bug: 861853
Change-Id: I499850a7ba8df4b73e5f71b6a61568a5cfca1e6b
Reviewed-on: https://chromium-review.googlesource.com/c/1355764Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Reviewed-by: Charlie Reis <creis@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612494}

content/browser/BUILD.gn

@@ -1938,6 +1938,7 @@ jumbo_source_set("browser") {
       "child_process_launcher_helper_fuchsia.cc",
       "memory/memory_monitor_fuchsia.cc",
     ]
+    deps += [ "//third_party/fuchsia-sdk/sdk:zx" ]
   } else if (is_posix) {
     sources += [
       "child_process_launcher_helper_posix.cc",

content/browser/child_process_launcher_helper.h

@@ -39,7 +39,7 @@
 #endif
 
 #if defined(OS_FUCHSIA)
-#include "content/common/sandbox_policy_fuchsia.h"
+#include "services/service_manager/sandbox/fuchsia/sandbox_policy_fuchsia.h"
 #endif
 
 #if BUILDFLAG(USE_ZYGOTE_HANDLE)
@@ -247,7 +247,7 @@ class ChildProcessLauncherHelper :
 #endif
 
 #if defined(OS_FUCHSIA)
-  SandboxPolicyFuchsia sandbox_policy_;
+  service_manager::SandboxPolicyFuchsia sandbox_policy_;
 #endif
 };
 

content/browser/child_process_launcher_helper_fuchsia.cc

@@ -7,7 +7,6 @@
 #include "base/command_line.h"
 #include "base/process/launch.h"
 #include "content/browser/child_process_launcher.h"
-#include "content/common/sandbox_policy_fuchsia.h"
 #include "content/public/browser/child_process_launcher_utils.h"
 #include "content/public/common/sandboxed_process_launcher_delegate.h"
 #include "services/service_manager/embedder/result_codes.h"

content/common/BUILD.gn

@@ -456,18 +456,8 @@ source_set("common") {
   }
 
   if (is_fuchsia) {
-    sources += [
-      "font_list_fuchsia.cc",
-      "sandbox_policy_fuchsia.cc",
-      "sandbox_policy_fuchsia.h",
-    ]
-
-    deps += [
-      "//third_party/fuchsia-sdk/sdk:fdio",
-      "//third_party/fuchsia-sdk/sdk:fonts",
-      "//third_party/fuchsia-sdk/sdk:mediacodec",
-      "//third_party/fuchsia-sdk/sdk:scenic",
-    ]
+    sources += [ "font_list_fuchsia.cc" ]
+    deps += [ "//third_party/fuchsia-sdk/sdk:fdio" ]
   }
 }
 

services/service_manager/sandbox/BUILD.gn

@@ -98,6 +98,18 @@ component("sandbox") {
     ]
     deps += [ "//sandbox/win:sandbox" ]
   }
+  if (is_fuchsia) {
+    sources += [
+      "fuchsia/sandbox_policy_fuchsia.cc",
+      "fuchsia/sandbox_policy_fuchsia.h",
+    ]
+
+    deps += [
+      "//third_party/fuchsia-sdk/sdk:fonts",
+      "//third_party/fuchsia-sdk/sdk:mediacodec",
+      "//third_party/fuchsia-sdk/sdk:scenic",
+    ]
+  }
 }
 
 buildflag_header("sanitizer_buildflags") {

services/service_manager/sandbox/fuchsia/OWNERS

+file://build/fuchsia/OWNERS

content/common/sandbox_policy_fuchsia.cc → services/service_manager/sandbox/fuchsia/sandbox_policy_fuchsia.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/sandbox_policy_fuchsia.h"
+#include "services/service_manager/sandbox/fuchsia/sandbox_policy_fuchsia.h"
 
 #include <lib/fdio/spawn.h>
 #include <stdio.h>
@@ -24,10 +24,9 @@
 #include "base/process/launch.h"
 #include "base/process/process.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "content/public/common/content_switches.h"
 #include "services/service_manager/sandbox/switches.h"
 
-namespace content {
+namespace service_manager {
 namespace {
 
 constexpr const char* const kRendererServices[] = {
@@ -123,4 +122,4 @@ void SandboxPolicyFuchsia::UpdateLaunchOptionsForSandbox(
   }
 }
 
-}  // namespace content
+}  // namespace service_manager

content/common/sandbox_policy_fuchsia.h → services/service_manager/sandbox/fuchsia/sandbox_policy_fuchsia.h

@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_SANDBOX_POLICY_FUCHSIA_H_
-#define CONTENT_COMMON_SANDBOX_POLICY_FUCHSIA_H_
+#ifndef SERVICES_SERVICE_MANAGER_SANDBOX_FUCHSIA_SANDBOX_POLICY_FUCHSIA_H_
+#define SERVICES_SERVICE_MANAGER_SANDBOX_FUCHSIA_SANDBOX_POLICY_FUCHSIA_H_
 
 #include <lib/zx/channel.h>
 
 #include "base/memory/ref_counted.h"
+#include "services/service_manager/sandbox/export.h"
 #include "services/service_manager/sandbox/sandbox_type.h"
 
 namespace base {
@@ -20,9 +21,9 @@ class FilteredServiceDirectory;
 
 }  // namespace base
 
-namespace content {
+namespace service_manager {
 
-class SandboxPolicyFuchsia {
+class SERVICE_MANAGER_SANDBOX_EXPORT SandboxPolicyFuchsia {
  public:
   SandboxPolicyFuchsia();
   ~SandboxPolicyFuchsia();
@@ -44,8 +45,10 @@ class SandboxPolicyFuchsia {
   std::unique_ptr<base::fuchsia::FilteredServiceDirectory> service_directory_;
   zx::channel service_directory_client_channel_;
   scoped_refptr<base::SequencedTaskRunner> service_directory_task_runner_;
+
+  DISALLOW_COPY_AND_ASSIGN(SandboxPolicyFuchsia);
 };
 
-}  // namespace content
+}  // namespace service_manager
 
-#endif  // CONTENT_COMMON_SANDBOX_POLICY_FUCHSIA_H_
+#endif  // SERVICES_SERVICE_MANAGER_SANDBOX_FUCHSIA_SANDBOX_POLICY_FUCHSIA_H_