[Mojo Video Capture] Hook up video capture service behind a feature flag

content/browser/service_manager/service_manager_context.cc

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 eeb813967f87603be8ade337d8b31273a35f2067..c57ed80c71934a1c0616f206e2e496fe6468a057 100644
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc
@@ -49,6 +49,7 @@
 #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/interfaces/constants.mojom.h"
 
 namespace content {
 
@@ -343,6 +344,9 @@ ServiceManagerContext::ServiceManagerContext() {
         std::make_pair(content::mojom::kNetworkServiceName,
                        base::ASCIIToUTF16("Network Service")));
   }
+  unsandboxed_services.insert(

[mcasas, 2017/05/10 02:33:33]

Shouldn't we have a command line check like in l.339?

[chfremer, 2017/05/10 17:59:40]

You are right. Unless the feature is enabled, we don't have to register the
service here.

Done.

+      std::make_pair(video_capture::mojom::kServiceName,
+                     base::ASCIIToUTF16("Video Capture Service")));
 
   for (const auto& service : unsandboxed_services) {
     packaged_services_connection_->AddServiceRequestHandler(