Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(655)

Unified Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 2900583002: Revert of [Mojo Video Capture] Hook up video capture service behind a feature flag (Closed)
Patch Set: Rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/media_stream_manager.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index 71546d64146d1b6b718552e62955c6127000e3ca..b6011c339de9301ae070673c6059097198110037 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -33,9 +33,7 @@
#include "content/browser/renderer_host/media/media_devices_manager.h"
#include "content/browser/renderer_host/media/media_stream_requester.h"
#include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
-#include "content/browser/renderer_host/media/service_video_capture_provider.h"
#include "content/browser/renderer_host/media/video_capture_manager.h"
-#include "content/browser/renderer_host/media/video_capture_provider_switcher.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/content_browser_client.h"
@@ -54,7 +52,6 @@
#include "media/base/media_switches.h"
#include "media/capture/video/video_capture_device_factory.h"
#include "media/capture/video/video_capture_system_impl.h"
-#include "services/video_capture/public/cpp/constants.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -427,11 +424,6 @@ MediaStreamManager::MediaStreamManager(
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));
- }
}
InitializeMaybeAsync(std::move(video_capture_provider));
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/renderer_host/media/service_video_capture_device_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698