Remove enable_webrtc and treat it as always true from now on.
enable_webrtc=false has been broken for months and no one has noticed,
so let's get rid of this complexity. WebRTC will now be a part of
Chromium until the serpent Nidhoggr ascends into the sky and ushers
in Ragnarök.
Next step: remove #ifdef'd code that depends on defines that
were set by enable_webrtc.
Bug: chromium:800653
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I1661fc56b8005fdae92c3441bb9d7204944bd7c5
Reviewed-on: https://chromium-review.googlesource.com/1044220
Reviewed-by: Jochen Eisinger <[email protected]>
Commit-Queue: Patrik Höglund <[email protected]>
Cr-Commit-Position: refs/heads/master@{#556420}diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 46001ede..dbc59a9 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -97,6 +97,7 @@
"//gpu/ipc/common:gpu_preferences_util",
"//gpu/ipc/host",
"//gpu/vulkan:buildflags",
+ "//jingle:jingle_glue",
"//media",
"//media:media_buildflags",
"//media/capture",
@@ -170,6 +171,9 @@
"//third_party/icu",
"//third_party/libyuv",
"//third_party/re2",
+ "//third_party/webrtc/media:rtc_media_base",
+ "//third_party/webrtc/modules/desktop_capture:primitives",
+ "//third_party/webrtc/rtc_base:rtc_base",
"//third_party/zlib",
"//third_party/zlib/google:compression_utils",
"//third_party/zlib/google:zip",
@@ -1358,6 +1362,8 @@
"renderer_host/media/media_stream_track_metrics_host.h",
"renderer_host/media/media_stream_ui_proxy.cc",
"renderer_host/media/media_stream_ui_proxy.h",
+ "renderer_host/media/peer_connection_tracker_host.cc",
+ "renderer_host/media/peer_connection_tracker_host.h",
"renderer_host/media/render_frame_audio_input_stream_factory.cc",
"renderer_host/media/render_frame_audio_input_stream_factory.h",
"renderer_host/media/render_frame_audio_output_stream_factory.cc",
@@ -1392,6 +1398,18 @@
"renderer_host/overscroll_controller.cc",
"renderer_host/overscroll_controller.h",
"renderer_host/overscroll_controller_delegate.h",
+ "renderer_host/p2p/socket_dispatcher_host.cc",
+ "renderer_host/p2p/socket_dispatcher_host.h",
+ "renderer_host/p2p/socket_host.cc",
+ "renderer_host/p2p/socket_host.h",
+ "renderer_host/p2p/socket_host_tcp.cc",
+ "renderer_host/p2p/socket_host_tcp.h",
+ "renderer_host/p2p/socket_host_tcp_server.cc",
+ "renderer_host/p2p/socket_host_tcp_server.h",
+ "renderer_host/p2p/socket_host_throttler.cc",
+ "renderer_host/p2p/socket_host_throttler.h",
+ "renderer_host/p2p/socket_host_udp.cc",
+ "renderer_host/p2p/socket_host_udp.h",
"renderer_host/render_frame_metadata_provider_impl.cc",
"renderer_host/render_frame_metadata_provider_impl.h",
"renderer_host/render_message_filter.cc",
@@ -1701,6 +1719,13 @@
"web_package/web_package_prefetch_handler.h",
"web_package/web_package_request_handler.cc",
"web_package/web_package_request_handler.h",
+ "webrtc/webrtc_internals.cc",
+ "webrtc/webrtc_internals.h",
+ "webrtc/webrtc_internals_message_handler.cc",
+ "webrtc/webrtc_internals_message_handler.h",
+ "webrtc/webrtc_internals_ui.cc",
+ "webrtc/webrtc_internals_ui.h",
+ "webrtc/webrtc_internals_ui_observer.h",
"websockets/websocket_handshake_request_info_impl.cc",
"websockets/websocket_handshake_request_info_impl.h",
"websockets/websocket_manager.cc",
@@ -1801,39 +1826,6 @@
]
}
- if (enable_webrtc) {
- sources += [
- "renderer_host/media/peer_connection_tracker_host.cc",
- "renderer_host/media/peer_connection_tracker_host.h",
- "renderer_host/p2p/socket_dispatcher_host.cc",
- "renderer_host/p2p/socket_dispatcher_host.h",
- "renderer_host/p2p/socket_host.cc",
- "renderer_host/p2p/socket_host.h",
- "renderer_host/p2p/socket_host_tcp.cc",
- "renderer_host/p2p/socket_host_tcp.h",
- "renderer_host/p2p/socket_host_tcp_server.cc",
- "renderer_host/p2p/socket_host_tcp_server.h",
- "renderer_host/p2p/socket_host_throttler.cc",
- "renderer_host/p2p/socket_host_throttler.h",
- "renderer_host/p2p/socket_host_udp.cc",
- "renderer_host/p2p/socket_host_udp.h",
- "webrtc/webrtc_internals.cc",
- "webrtc/webrtc_internals.h",
- "webrtc/webrtc_internals_message_handler.cc",
- "webrtc/webrtc_internals_message_handler.h",
- "webrtc/webrtc_internals_ui.cc",
- "webrtc/webrtc_internals_ui.h",
- "webrtc/webrtc_internals_ui_observer.h",
- ]
-
- deps += [
- "//jingle:jingle_glue",
- "//third_party/webrtc/media:rtc_media_base",
- "//third_party/webrtc/modules/desktop_capture:primitives",
- "//third_party/webrtc/rtc_base:rtc_base",
- ]
- }
-
# Desktop/Window/WebContents screen capture implementations, conditionally
# built depending on the available implementations for each platform.
if (is_linux || is_mac || is_win) {
@@ -1841,6 +1833,8 @@
sources += [
"media/capture/cursor_renderer.cc",
"media/capture/cursor_renderer.h",
+ "media/capture/desktop_capture_device.cc",
+ "media/capture/desktop_capture_device.h",
"media/capture/fake_webcontent_capture_machine.cc",
"media/capture/fake_webcontent_capture_machine.h",
"media/capture/frame_sink_video_capture_device.cc",
@@ -1848,6 +1842,8 @@
"media/capture/web_contents_video_capture_device.cc",
"media/capture/web_contents_video_capture_device.h",
]
+ public_deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
+ deps += [ "//third_party/webrtc/modules/desktop_capture" ]
if (use_aura) {
sources += [
"media/capture/aura_window_capture_machine.cc",
@@ -1868,14 +1864,6 @@
"//sandbox/mac:seatbelt_extension",
]
}
- if (enable_webrtc) {
- sources += [
- "media/capture/desktop_capture_device.cc",
- "media/capture/desktop_capture_device.h",
- ]
- deps += [ "//third_party/webrtc/modules/desktop_capture" ]
- public_deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
- }
}
if (is_win) {
