| Index: content/browser/service_manager/service_manager_context.cc
|
| diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
|
| index c6076ce6e0b7c1cb56f9c433032dd5dc5718b80d..9145c380759db1da19e24ba140d3368ebe420a39 100644
|
| --- a/content/browser/service_manager/service_manager_context.cc
|
| +++ b/content/browser/service_manager/service_manager_context.cc
|
| @@ -14,6 +14,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/single_thread_task_runner.h"
|
| +#include "base/strings/utf_string_conversions.h"
|
| #include "content/browser/gpu/gpu_process_host.h"
|
| #include "content/browser/service_manager/merge_dictionary.h"
|
| #include "content/common/service_manager/service_manager_connection_impl.h"
|
| @@ -37,6 +38,7 @@
|
| #include "services/service_manager/public/interfaces/service.mojom.h"
|
| #include "services/service_manager/runner/common/client_util.h"
|
| #include "services/service_manager/service_manager.h"
|
| +#include "services/shape_detection/public/interfaces/constants.mojom.h"
|
|
|
| namespace content {
|
|
|
| @@ -279,6 +281,7 @@ ServiceManagerContext::ServiceManagerContext() {
|
| for (const auto& entry : services) {
|
| ServiceManagerConnection::GetForProcess()->AddEmbeddedService(entry.first,
|
| entry.second);
|
| + DLOG(ERROR) << entry.first;
|
| }
|
|
|
| // This is safe to assign directly from any thread, because
|
| @@ -298,17 +301,23 @@ ServiceManagerContext::ServiceManagerContext() {
|
| service.first,
|
| base::Bind(&StartServiceInUtilityProcess, service.first, service.second,
|
| true /* use_sandbox */));
|
| + DLOG(ERROR) << service.first;
|
| }
|
|
|
| ContentBrowserClient::OutOfProcessServiceMap unsandboxed_services;
|
| GetContentClient()
|
| ->browser()
|
| ->RegisterUnsandboxedOutOfProcessServices(&unsandboxed_services);
|
| + DLOG(ERROR) << "Register shape_detection in content browser";
|
| + unsandboxed_services.insert(
|
| + std::make_pair(shape_detection::mojom::kServiceName,
|
| + base::ASCIIToUTF16("Shape Detection Service")));
|
| for (const auto& service : unsandboxed_services) {
|
| ServiceManagerConnection::GetForProcess()->AddServiceRequestHandler(
|
| service.first,
|
| base::Bind(&StartServiceInUtilityProcess, service.first, service.second,
|
| false /* use_sandbox */));
|
| + DLOG(ERROR) << service.first;
|
| }
|
|
|
| #if (ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
|
|
|