3 files changed, 209 insertions, 0 deletions
diff --git a/chromium/content/shell/utility/DEPS b/chromium/content/shell/utility/DEPS
new file mode 100644
index 00000000000..ad55dbd28a3
--- /dev/null
+++ b/chromium/content/shell/utility/DEPS
@@ -0,0 +1,5 @@
+include_rules = [
+  "+components/services/storage/test_api",
+  "+services/service_manager",
+  "+services/test/echo",
+]
diff --git a/chromium/content/shell/utility/shell_content_utility_client.cc b/chromium/content/shell/utility/shell_content_utility_client.cc
new file mode 100644
index 00000000000..9773ac66021
--- /dev/null
+++ b/chromium/content/shell/utility/shell_content_utility_client.cc
@@ -0,0 +1,166 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/shell/utility/shell_content_utility_client.h"
+
+#include <memory>
+#include <utility>
+
+#include "base/bind.h"
+#include "base/command_line.h"
+#include "base/containers/span.h"
+#include "base/files/scoped_temp_dir.h"
+#include "base/memory/ptr_util.h"
+#include "base/memory/read_only_shared_memory_region.h"
+#include "base/memory/shared_memory_mapping.h"
+#include "base/memory/unsafe_shared_memory_region.h"
+#include "base/memory/writable_shared_memory_region.h"
+#include "base/process/process.h"
+#include "build/build_config.h"
+#include "components/services/storage/test_api/test_api.h"
+#include "content/public/child/child_thread.h"
+#include "content/public/common/content_switches.h"
+#include "content/public/test/test_service.mojom.h"
+#include "content/public/utility/utility_thread.h"
+#include "content/shell/common/power_monitor_test_impl.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
+#include "mojo/public/cpp/bindings/service_factory.h"
+#include "mojo/public/cpp/system/buffer.h"
+#include "sandbox/policy/sandbox.h"
+#include "services/test/echo/echo_service.h"
+
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#include "content/test/sandbox_status_service.h"
+#endif
+
+namespace content {
+
+namespace {
+
+class TestUtilityServiceImpl : public mojom::TestService {
+ public:
+  static void Create(mojo::PendingReceiver<mojom::TestService> receiver) {
+    mojo::MakeSelfOwnedReceiver(base::WrapUnique(new TestUtilityServiceImpl),
+                                std::move(receiver));
+  }
+
+  TestUtilityServiceImpl(const TestUtilityServiceImpl&) = delete;
+  TestUtilityServiceImpl& operator=(const TestUtilityServiceImpl&) = delete;
+
+  // mojom::TestService implementation:
+  void DoSomething(DoSomethingCallback callback) override {
+    std::move(callback).Run();
+  }
+
+  void DoTerminateProcess(DoTerminateProcessCallback callback) override {
+    base::Process::TerminateCurrentProcessImmediately(0);
+  }
+
+  void DoCrashImmediately(DoCrashImmediatelyCallback callback) override {
+    IMMEDIATE_CRASH();
+  }
+
+  void CreateFolder(CreateFolderCallback callback) override {
+    // Note: This is used to check if the sandbox is disabled or not since
+    //       creating a folder is forbidden when it is enabled.
+    std::move(callback).Run(base::ScopedTempDir().CreateUniqueTempDir());
+  }
+
+  void GetRequestorName(GetRequestorNameCallback callback) override {
+    NOTREACHED();
+  }
+
+  void CreateReadOnlySharedMemoryRegion(
+      const std::string& message,
+      CreateReadOnlySharedMemoryRegionCallback callback) override {
+    base::MappedReadOnlyRegion map_and_region =
+        base::ReadOnlySharedMemoryRegion::Create(message.size());
+    CHECK(map_and_region.IsValid());
+    std::copy(message.begin(), message.end(),
+              map_and_region.mapping.GetMemoryAsSpan<char>().begin());
+    std::move(callback).Run(std::move(map_and_region.region));
+  }
+
+  void CreateWritableSharedMemoryRegion(
+      const std::string& message,
+      CreateWritableSharedMemoryRegionCallback callback) override {
+    auto region = base::WritableSharedMemoryRegion::Create(message.size());
+    CHECK(region.IsValid());
+    base::WritableSharedMemoryMapping mapping = region.Map();
+    CHECK(mapping.IsValid());
+    std::copy(message.begin(), message.end(),
+              mapping.GetMemoryAsSpan<char>().begin());
+    std::move(callback).Run(std::move(region));
+  }
+
+  void CreateUnsafeSharedMemoryRegion(
+      const std::string& message,
+      CreateUnsafeSharedMemoryRegionCallback callback) override {
+    auto region = base::UnsafeSharedMemoryRegion::Create(message.size());
+    CHECK(region.IsValid());
+    base::WritableSharedMemoryMapping mapping = region.Map();
+    CHECK(mapping.IsValid());
+    std::copy(message.begin(), message.end(),
+              mapping.GetMemoryAsSpan<char>().begin());
+    std::move(callback).Run(std::move(region));
+  }
+
+  void IsProcessSandboxed(IsProcessSandboxedCallback callback) override {
+    std::move(callback).Run(sandbox::policy::Sandbox::IsProcessSandboxed());
+  }
+
+ private:
+  TestUtilityServiceImpl() = default;
+};
+
+auto RunEchoService(mojo::PendingReceiver<echo::mojom::EchoService> receiver) {
+  return std::make_unique<echo::EchoService>(std::move(receiver));
+}
+
+}  // namespace
+
+ShellContentUtilityClient::ShellContentUtilityClient(bool is_browsertest) {
+  if (is_browsertest &&
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kProcessType) == switches::kUtilityProcess) {
+    network_service_test_helper_ = std::make_unique<NetworkServiceTestHelper>();
+    audio_service_test_helper_ = std::make_unique<AudioServiceTestHelper>();
+    storage::InjectTestApiImplementation();
+    register_sandbox_status_helper_ = true;
+  }
+}
+
+ShellContentUtilityClient::~ShellContentUtilityClient() = default;
+
+void ShellContentUtilityClient::ExposeInterfacesToBrowser(
+    mojo::BinderMap* binders) {
+  binders->Add(base::BindRepeating(&TestUtilityServiceImpl::Create),
+               base::ThreadTaskRunnerHandle::Get());
+  binders->Add<mojom::PowerMonitorTest>(
+      base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver),
+      base::ThreadTaskRunnerHandle::Get());
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+  if (register_sandbox_status_helper_) {
+    binders->Add<content::mojom::SandboxStatusService>(
+        base::BindRepeating(
+            &content::SandboxStatusService::MakeSelfOwnedReceiver),
+        base::ThreadTaskRunnerHandle::Get());
+  }
+#endif
+}
+
+void ShellContentUtilityClient::RegisterIOThreadServices(
+    mojo::ServiceFactory& services) {
+  services.Add(RunEchoService);
+}
+
+void ShellContentUtilityClient::RegisterNetworkBinders(
+    service_manager::BinderRegistry* registry) {
+  if (network_service_test_helper_)
+    network_service_test_helper_->RegisterNetworkBinders(registry);
+}
+
+}  // namespace content
diff --git a/chromium/content/shell/utility/shell_content_utility_client.h b/chromium/content/shell/utility/shell_content_utility_client.h
new file mode 100644
index 00000000000..fc51dfd16ff
--- /dev/null
+++ b/chromium/content/shell/utility/shell_content_utility_client.h
@@ -0,0 +1,38 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_SHELL_UTILITY_SHELL_CONTENT_UTILITY_CLIENT_H_
+#define CONTENT_SHELL_UTILITY_SHELL_CONTENT_UTILITY_CLIENT_H_
+
+#include "content/public/test/audio_service_test_helper.h"
+#include "content/public/test/network_service_test_helper.h"
+#include "content/public/utility/content_utility_client.h"
+
+namespace content {
+
+class ShellContentUtilityClient : public ContentUtilityClient {
+ public:
+  explicit ShellContentUtilityClient(bool is_browsertest = false);
+
+  ShellContentUtilityClient(const ShellContentUtilityClient&) = delete;
+  ShellContentUtilityClient& operator=(const ShellContentUtilityClient&) =
+      delete;
+
+  ~ShellContentUtilityClient() override;
+
+  // ContentUtilityClient:
+  void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override;
+  void RegisterIOThreadServices(mojo::ServiceFactory& services) override;
+  void RegisterNetworkBinders(
+      service_manager::BinderRegistry* registry) override;
+
+ private:
+  std::unique_ptr<NetworkServiceTestHelper> network_service_test_helper_;
+  std::unique_ptr<AudioServiceTestHelper> audio_service_test_helper_;
+  bool register_sandbox_status_helper_ = false;
+};
+
+}  // namespace content
+
+#endif  // CONTENT_SHELL_UTILITY_SHELL_CONTENT_UTILITY_CLIENT_H_