[Mojo Video Capture] Do not instantiate in-process VideoCaptureSystem when using service

content/browser/renderer_host/media/media_stream_manager.cc

 // Copyright (c) 2012 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/renderer_host/media/media_stream_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 403 matching lines @@
   if (!video_capture_provider) {
     scoped_refptr<base::SingleThreadTaskRunner> device_task_runner =
         audio_system_->GetTaskRunner();
 #if defined(OS_WIN)
     // Use an STA Video Capture Thread to try to avoid crashes on enumeration of
     // buggy third party Direct Show modules, http://crbug.com/428958.
     video_capture_thread_.init_com_with_mta(false);
     CHECK(video_capture_thread_.Start());
     device_task_runner = video_capture_thread_.task_runner();
 #endif
-    video_capture_provider = base::MakeUnique<InProcessVideoCaptureProvider>(
-        base::MakeUnique<media::VideoCaptureSystemImpl>(
-            media::VideoCaptureDeviceFactory::CreateFactory(
-                BrowserThread::GetTaskRunnerForThread(BrowserThread::UI))),
-        std::move(device_task_runner));
     if (base::FeatureList::IsEnabled(video_capture::kMojoVideoCapture)) {
       video_capture_provider = base::MakeUnique<VideoCaptureProviderSwitcher>(
           base::MakeUnique<ServiceVideoCaptureProvider>(),
-          std::move(video_capture_provider));
+          InProcessVideoCaptureProvider::CreateInstanceForNonDeviceCapture(
+              std::move(device_task_runner)));
+    } else {
+      video_capture_provider = InProcessVideoCaptureProvider::CreateInstance(
+          base::MakeUnique<media::VideoCaptureSystemImpl>(
+              media::VideoCaptureDeviceFactory::CreateFactory(
+                  BrowserThread::GetTaskRunnerForThread(BrowserThread::UI))),
+          std::move(device_task_runner));
     }
   }
   InitializeMaybeAsync(std::move(video_capture_provider));
 
   base::PowerMonitor* power_monitor = base::PowerMonitor::Get();
   // BrowserMainLoop always creates the PowerMonitor instance before creating
   // MediaStreamManager, but power_monitor may be NULL in unit tests.
   if (power_monitor)
     power_monitor->AddObserver(this);
 }
@@ skipping 1338 matching lines @@
     request->ui_proxy->OnStarted(
         base::Bind(&MediaStreamManager::StopMediaStreamFromBrowser,
                    base::Unretained(this), label),
         base::Bind(&MediaStreamManager::OnMediaStreamUIWindowId,
                    base::Unretained(this), request->video_type(),
                    request->devices));
   }
 }
 
 }  // namespace content