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

content/browser/service_manager/service_manager_context.cc

 // 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/browser/service_manager/service_manager_context.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 31 matching lines @@
 #include "services/data_decoder/public/interfaces/constants.mojom.h"
 #include "services/device/device_service.h"
 #include "services/device/public/interfaces/constants.mojom.h"
 #include "services/service_manager/connect_params.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
 #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"
+#include "services/video_capture/public/interfaces/constants.mojom.h"
 
 namespace content {
 
 namespace {
 
 base::LazyInstance<std::unique_ptr<service_manager::Connector>>::Leaky
     g_io_thread_connector = LAZY_INSTANCE_INITIALIZER;
 
 void DestroyConnectorOnIOThread() { g_io_thread_connector.Get().reset(); }
 
@@ skipping 274 matching lines @@
       ->RegisterUnsandboxedOutOfProcessServices(&unsandboxed_services);
 
   bool network_service_enabled =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableNetworkService);
   if (network_service_enabled) {
     unsandboxed_services.insert(
         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(
         service.first, base::Bind(&StartServiceInUtilityProcess, service.first,
                                   service.second, false /* use_sandbox */));
   }
 
 #if (ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
   packaged_services_connection_->AddServiceRequestHandler(
       "media", base::Bind(&StartServiceInGpuProcess, "media"));
@@ skipping 30 matching lines @@
                           base::Bind(&DestroyConnectorOnIOThread));
 }
 
 // static
 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return g_io_thread_connector.Get().get();
 }
 
 }  // namespace content