| 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 f13e9e69f67cfaf16d130932b5605d81aca68595..47532cf748daef47dcec28ba66a65a59a17a36fc 100644
|
| --- a/content/browser/service_manager/service_manager_context.cc
|
| +++ b/content/browser/service_manager/service_manager_context.cc
|
| @@ -10,6 +10,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| +#include "base/feature_list.h"
|
| #include "base/json/json_reader.h"
|
| #include "base/lazy_instance.h"
|
| #include "base/macros.h"
|
| @@ -51,6 +52,8 @@
|
| #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"
|
| +#include "services/video_capture/public/cpp/constants.h"
|
| +#include "services/video_capture/public/interfaces/constants.mojom.h"
|
|
|
| #if defined(OS_ANDROID)
|
| #include "base/android/jni_android.h"
|
| @@ -363,6 +366,11 @@ ServiceManagerContext::ServiceManagerContext() {
|
| std::make_pair(content::mojom::kNetworkServiceName,
|
| base::ASCIIToUTF16("Network Service")));
|
| }
|
| + if (base::FeatureList::IsEnabled(video_capture::kMojoVideoCapture)) {
|
| + unsandboxed_services.insert(
|
| + std::make_pair(video_capture::mojom::kServiceName,
|
| + base::ASCIIToUTF16("Video Capture Service")));
|
| + }
|
|
|
| for (const auto& service : unsandboxed_services) {
|
| packaged_services_connection_->AddServiceRequestHandler(
|
|
|