diff options
Diffstat (limited to 'chromium/services/service_manager/service_manager.cc')
| -rw-r--r-- | chromium/services/service_manager/service_manager.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chromium/services/service_manager/service_manager.cc b/chromium/services/service_manager/service_manager.cc index 3b43d60a938..493a95a4c6a 100644 --- a/chromium/services/service_manager/service_manager.cc +++ b/chromium/services/service_manager/service_manager.cc @@ -12,7 +12,6 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/logging.h" -#include "base/macros.h" #include "base/no_destructor.h" #include "base/path_service.h" #include "base/process/process.h" @@ -20,7 +19,7 @@ #include "base/token.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" -#include "sandbox/policy/sandbox_type.h" +#include "sandbox/policy/mojom/sandbox.mojom.h" #include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/constants.h" #include "services/service_manager/public/cpp/manifest_builder.h" @@ -83,15 +82,15 @@ class DefaultServiceProcessHost : public ServiceProcessHost { mojo::PendingRemote<mojom::Service> Launch( const Identity& identity, - sandbox::policy::SandboxType sandbox_type, + sandbox::mojom::Sandbox sandbox_type, const std::u16string& display_name, LaunchCallback callback) override { #if defined(OS_IOS) return mojo::NullRemote(); #else // TODO(https://crbug.com/781334): Support sandboxing. - CHECK_EQ(sandbox_type, sandbox::policy::SandboxType::kNoSandbox); - return launcher_.Start(identity, sandbox::policy::SandboxType::kNoSandbox, + CHECK_EQ(sandbox_type, sandbox::mojom::Sandbox::kNoSandbox); + return launcher_.Start(identity, sandbox::mojom::Sandbox::kNoSandbox, std::move(callback)); #endif // defined(OS_IOS) } |