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/1044220Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Patrik Höglund <phoglund@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556420}

chrome/browser/BUILD.gn

@@ -18,7 +18,6 @@ import("//components/signin/features.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//device/vr/buildflags/buildflags.gni")
 import("//extensions/buildflags/buildflags.gni")
-import("//media/media_options.gni")
 import("//net/features.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
@@ -453,6 +452,30 @@ jumbo_split_static_library("browser") {
     "engagement/top_sites/site_engagement_top_sites_provider.h",
     "experiments/memory_ablation_experiment.cc",
     "experiments/memory_ablation_experiment.h",
+    "media/webrtc/audio_debug_recordings_handler.cc",
+    "media/webrtc/audio_debug_recordings_handler.h",
+    "media/webrtc/webrtc_event_log_manager.cc",
+    "media/webrtc/webrtc_event_log_manager.h",
+    "media/webrtc/webrtc_event_log_manager_common.cc",
+    "media/webrtc/webrtc_event_log_manager_common.h",
+    "media/webrtc/webrtc_event_log_manager_local.cc",
+    "media/webrtc/webrtc_event_log_manager_local.h",
+    "media/webrtc/webrtc_event_log_manager_remote.cc",
+    "media/webrtc/webrtc_event_log_manager_remote.h",
+    "media/webrtc/webrtc_event_log_uploader.cc",
+    "media/webrtc/webrtc_event_log_uploader.h",
+    "media/webrtc/webrtc_log_uploader.cc",
+    "media/webrtc/webrtc_log_uploader.h",
+    "media/webrtc/webrtc_log_util.cc",
+    "media/webrtc/webrtc_log_util.h",
+    "media/webrtc/webrtc_logging_handler_host.cc",
+    "media/webrtc/webrtc_logging_handler_host.h",
+    "media/webrtc/webrtc_rtp_dump_handler.cc",
+    "media/webrtc/webrtc_rtp_dump_handler.h",
+    "media/webrtc/webrtc_rtp_dump_writer.cc",
+    "media/webrtc/webrtc_rtp_dump_writer.h",
+    "media/webrtc/webrtc_text_log_handler.cc",
+    "media/webrtc/webrtc_text_log_handler.h",
 
     # Oh hey, all the cool browser/extensions files are hanging out in
     # //chrome/browser/extensions/BUILD.gn
@@ -1735,8 +1758,11 @@ jumbo_split_static_library("browser") {
     "//components/web_resource",
     "//components/webdata/common",
     "//components/webdata_services",
+    "//components/webrtc_logging/browser",
+    "//components/webrtc_logging/common",
     "//content/app/resources",
     "//content/public/browser",
+    "//content/public/browser",
     "//content/public/common",
     "//content/public/common:buildflags",
     "//content/public/common:feature_h264_with_openh264_ffmpeg",
@@ -1769,6 +1795,7 @@ jumbo_split_static_library("browser") {
     "//ppapi/buildflags",
     "//printing/buildflags",
     "//rlz/buildflags",
+    "//services/audio/public/cpp",
     "//services/data_decoder/public/cpp",
     "//services/device/public/cpp:device_features",
     "//services/device/public/mojom",
@@ -1805,6 +1832,8 @@ jumbo_split_static_library("browser") {
     "//third_party/metrics_proto",
     "//third_party/re2",
     "//third_party/smhasher:cityhash",
+    "//third_party/webrtc_overrides",
+    "//third_party/webrtc_overrides:init_webrtc",
     "//third_party/widevine/cdm:headers",
     "//third_party/zlib",
     "//third_party/zlib:minizip",
@@ -4112,43 +4141,6 @@ jumbo_split_static_library("browser") {
     ]
   }
 
-  if (enable_webrtc) {
-    sources += [
-      "media/webrtc/audio_debug_recordings_handler.cc",
-      "media/webrtc/audio_debug_recordings_handler.h",
-      "media/webrtc/webrtc_event_log_manager.cc",
-      "media/webrtc/webrtc_event_log_manager.h",
-      "media/webrtc/webrtc_event_log_manager_common.cc",
-      "media/webrtc/webrtc_event_log_manager_common.h",
-      "media/webrtc/webrtc_event_log_manager_local.cc",
-      "media/webrtc/webrtc_event_log_manager_local.h",
-      "media/webrtc/webrtc_event_log_manager_remote.cc",
-      "media/webrtc/webrtc_event_log_manager_remote.h",
-      "media/webrtc/webrtc_event_log_uploader.cc",
-      "media/webrtc/webrtc_event_log_uploader.h",
-      "media/webrtc/webrtc_log_uploader.cc",
-      "media/webrtc/webrtc_log_uploader.h",
-      "media/webrtc/webrtc_log_util.cc",
-      "media/webrtc/webrtc_log_util.h",
-      "media/webrtc/webrtc_logging_handler_host.cc",
-      "media/webrtc/webrtc_logging_handler_host.h",
-      "media/webrtc/webrtc_rtp_dump_handler.cc",
-      "media/webrtc/webrtc_rtp_dump_handler.h",
-      "media/webrtc/webrtc_rtp_dump_writer.cc",
-      "media/webrtc/webrtc_rtp_dump_writer.h",
-      "media/webrtc/webrtc_text_log_handler.cc",
-      "media/webrtc/webrtc_text_log_handler.h",
-    ]
-    deps += [
-      "//components/webrtc_logging/browser",
-      "//components/webrtc_logging/common",
-      "//content/public/browser",
-      "//services/audio/public/cpp",
-      "//third_party/webrtc_overrides",
-      "//third_party/webrtc_overrides:init_webrtc",
-    ]
-  }
-
   if (!is_chrome_branded && !is_android) {
     sources += [
       "search/local_files_ntp_source.cc",

chrome/browser/extensions/BUILD.gn

@@ -7,7 +7,6 @@ import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
 import("//components/nacl/features.gni")
 import("//extensions/buildflags/buildflags.gni")
-import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//rlz/buildflags/buildflags.gni")
 
@@ -435,6 +434,7 @@ static_library("extensions") {
     "api/webrtc_audio_private/webrtc_audio_private_api.h",
     "api/webrtc_desktop_capture_private/webrtc_desktop_capture_private_api.cc",
     "api/webrtc_desktop_capture_private/webrtc_desktop_capture_private_api.h",
+    "api/webrtc_logging_private/webrtc_logging_private_api.cc",
     "api/webrtc_logging_private/webrtc_logging_private_api.h",
     "api/webstore_private/webstore_private_api.cc",
     "api/webstore_private/webstore_private_api.h",
@@ -1139,13 +1139,6 @@ static_library("extensions") {
     deps += [ "//rlz:rlz_lib" ]
   }
 
-  if (enable_webrtc) {
-    sources += [ "api/webrtc_logging_private/webrtc_logging_private_api.cc" ]
-  } else {
-    sources +=
-        [ "api/webrtc_logging_private/webrtc_logging_private_api_stub.cc" ]
-  }
-
   if (toolkit_views) {
     deps += [ "//ui/views" ]
   }

chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api_stub.cc

-// Copyright 2013 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.
-//
-// Stub implementation used when WebRTC is not enabled.
-
-#include "chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.h"
-
-namespace extensions {
-
-namespace {
-
-const char kErrorNotSupported[] = "Not supported";
-
-}  // namespace
-
-bool WebrtcLoggingPrivateSetMetaDataFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-bool WebrtcLoggingPrivateStartFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-bool WebrtcLoggingPrivateSetUploadOnRenderCloseFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-bool WebrtcLoggingPrivateStopFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-bool WebrtcLoggingPrivateStoreFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-bool WebrtcLoggingPrivateUploadStoredFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-bool WebrtcLoggingPrivateUploadFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-bool WebrtcLoggingPrivateDiscardFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-bool WebrtcLoggingPrivateStartRtpDumpFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-bool WebrtcLoggingPrivateStopRtpDumpFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-bool WebrtcLoggingPrivateStartAudioDebugRecordingsFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-bool WebrtcLoggingPrivateStopAudioDebugRecordingsFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-bool WebrtcLoggingPrivateGetLogsDirectoryFunction::RunAsync() {
-  SetError(kErrorNotSupported);
-  SendResponse(false);
-  return false;
-}
-
-}  // namespace extensions

chrome/browser/ui/BUILD.gn

@@ -12,7 +12,6 @@ import("//components/nacl/features.gni")
 import("//components/offline_pages/buildflags/features.gni")
 import("//components/signin/features.gni")
 import("//extensions/buildflags/buildflags.gni")
-import("//media/media_options.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//rlz/buildflags/buildflags.gni")
@@ -784,6 +783,8 @@ split_static_library("ui") {
     "webui/log_web_ui_url.h",
     "webui/media/media_engagement_ui.cc",
     "webui/media/media_engagement_ui.h",
+    "webui/media/webrtc_logs_ui.cc",
+    "webui/media/webrtc_logs_ui.h",
     "webui/memory_internals_ui.cc",
     "webui/memory_internals_ui.h",
     "webui/metrics_handler.cc",
@@ -1015,6 +1016,7 @@ split_static_library("ui") {
     "//components/version_ui",
     "//components/web_cache/browser",
     "//components/web_resource",
+    "//components/webrtc_logging/browser",
     "//content/app/resources",
     "//content/public/common",
     "//crypto",
@@ -3850,14 +3852,6 @@ split_static_library("ui") {
     }
   }
 
-  if (enable_webrtc) {
-    sources += [
-      "webui/media/webrtc_logs_ui.cc",
-      "webui/media/webrtc_logs_ui.h",
-    ]
-    deps += [ "//components/webrtc_logging/browser" ]
-  }
-
   if (safe_browsing_mode == 1) {
     deps += [
       "//chrome/browser/safe_browsing:chunk_proto",

chrome/common/BUILD.gn

@@ -479,9 +479,6 @@ static_library("common") {
       "pepper_permission_util.h",
     ]
   }
-  if (!enable_webrtc) {
-    sources -= [ "media/webrtc_logging_messages.h" ]
-  }
 
   if (safe_browsing_mode != 0) {
     public_deps += [ "//chrome/common/safe_browsing" ]

chrome/common/extensions/api/BUILD.gn

@@ -6,7 +6,6 @@ import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
 import("//extensions/buildflags/buildflags.gni")
-import("//media/media_options.gni")
 import("//tools/json_schema_compiler/json_features.gni")
 import("//tools/json_schema_compiler/json_schema_api.gni")
 
@@ -16,6 +15,10 @@ schema_sources = [
   "accessibility_features.json",
   "accessibility_private.json",
   "activity_log_private.json",
+  "cast_streaming_receiver_session.idl",
+  "cast_streaming_rtp_stream.idl",
+  "cast_streaming_session.idl",
+  "cast_streaming_udp_transport.idl",
   "autofill_private.idl",
   "automation.idl",
   "automation_internal.idl",
@@ -131,15 +134,6 @@ if (enable_service_discovery) {
   schema_sources += [ "mdns.idl" ]
 }
 
-if (enable_webrtc) {
-  schema_sources += [
-    "cast_streaming_receiver_session.idl",
-    "cast_streaming_rtp_stream.idl",
-    "cast_streaming_session.idl",
-    "cast_streaming_udp_transport.idl",
-  ]
-}
-
 extensions_api_root_namespace = "extensions::api::%(namespace)s"
 
 extensions_api_uncompiled_sources = [

chrome/common/features.gni

@@ -80,8 +80,10 @@ chrome_grit_defines = [
   "enable_print_preview=$enable_print_preview",
   "enable_printing=$enable_basic_printing",
   "enable_service_discovery=$enable_service_discovery",
-  "enable_webrtc=$enable_webrtc",
   "enable_vr=$enable_vr",
+
+  # TODO(phoglund): Remove this.
+  "enable_webrtc=true",
   "mac_views_browser=$mac_views_browser",
   "safe_browsing_mode=$safe_browsing_mode",
   "optimize_webui=$optimize_webui",

chrome/renderer/BUILD.gn

@@ -8,7 +8,6 @@ import("//components/nacl/features.gni")
 import("//components/offline_pages/buildflags/features.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//extensions/buildflags/buildflags.gni")
-import("//media/media_options.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ -60,6 +59,10 @@ static_library("renderer") {
     "media/chrome_key_systems.h",
     "media/chrome_key_systems_provider.cc",
     "media/chrome_key_systems_provider.h",
+    "media/chrome_webrtc_log_message_delegate.cc",
+    "media/chrome_webrtc_log_message_delegate.h",
+    "media/webrtc_logging_message_filter.cc",
+    "media/webrtc_logging_message_filter.h",
     "net/net_error_helper.cc",
     "net/net_error_helper.h",
     "net/net_error_helper_core.cc",
@@ -346,24 +349,8 @@ static_library("renderer") {
     public_deps = [
       "//ipc",
     ]
-    if (!enable_webrtc) {
-      sources -= [
-        "media/cast_receiver_session.cc",
-        "media/cast_receiver_session.h",
-        "media/cast_rtp_stream.cc",
-        "media/cast_rtp_stream.h",
-      ]
-    }
-  }
-  if (enable_webrtc) {
-    sources += [
-      "media/chrome_webrtc_log_message_delegate.cc",
-      "media/chrome_webrtc_log_message_delegate.h",
-      "media/webrtc_logging_message_filter.cc",
-      "media/webrtc_logging_message_filter.h",
-    ]
   }
-  if (enable_extensions && enable_webrtc) {
+  if (enable_extensions) {
     sources += [
       "extensions/cast_streaming_native_handler.cc",
       "extensions/cast_streaming_native_handler.h",
@@ -428,6 +415,8 @@ static_library("test_support") {
   sources = [
     "chrome_mock_render_thread.cc",
     "chrome_mock_render_thread.h",
+    "media/mock_webrtc_logging_message_filter.cc",
+    "media/mock_webrtc_logging_message_filter.h",
     "safe_browsing/mock_feature_extractor_clock.cc",
     "safe_browsing/mock_feature_extractor_clock.h",
     "safe_browsing/test_utils.cc",
@@ -443,13 +432,6 @@ static_library("test_support") {
     "//testing/gtest",
   ]
 
-  if (enable_webrtc) {
-    sources += [
-      "media/mock_webrtc_logging_message_filter.cc",
-      "media/mock_webrtc_logging_message_filter.h",
-    ]
-  }
-
   if (is_android) {
     sources -= [
       "safe_browsing/mock_feature_extractor_clock.cc",

chrome/test/BUILD.gn

@@ -16,7 +16,6 @@ import("//components/os_crypt/features.gni")
 import("//components/signin/features.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//extensions/buildflags/buildflags.gni")
-import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//remoting/remoting_enable.gni")
@@ -1742,6 +1741,7 @@ test("browser_tests") {
         "//components/exo:test_support",
         "//components/prefs",
         "//components/user_manager:test_support",
+        "//content/public/common:feature_h264_with_openh264_ffmpeg",
         "//services/audio/public/cpp:test_support",
         "//services/network/public/mojom",
         "//services/preferences/public/cpp",
@@ -1805,31 +1805,7 @@ test("browser_tests") {
     if (enable_captive_portal_detection) {
       sources += [ "../browser/captive_portal/captive_portal_browsertest.cc" ]
     }
-    if (enable_webrtc) {
-      deps += [ "//content/public/common:feature_h264_with_openh264_ffmpeg" ]
-    } else {
-      sources -= [
-        "../browser/media/webrtc/webrtc_apprtc_browsertest.cc",
-        "../browser/media/webrtc/webrtc_audio_quality_browsertest.cc",
-        "../browser/media/webrtc/webrtc_browsertest.cc",
-        "../browser/media/webrtc/webrtc_disable_encryption_flag_browsertest.cc",
-        "../browser/media/webrtc/webrtc_getmediadevices_browsertest.cc",
-        "../browser/media/webrtc/webrtc_internals_integration_browsertest.cc",
-        "../browser/media/webrtc/webrtc_internals_perf_browsertest.cc",
-        "../browser/media/webrtc/webrtc_rtp_browsertest.cc",
-        "../browser/media/webrtc/webrtc_simulcast_browsertest.cc",
-        "../browser/media/webrtc/webrtc_stats_perf_browsertest.cc",
-        "../browser/media/webrtc/webrtc_video_display_perf_browsertest.cc",
-        "../browser/media/webrtc/webrtc_video_quality_browsertest.cc",
-        "../browser/media/webrtc/webrtc_webcam_browsertest.cc",
-      ]
-      if (enable_extensions) {
-        sources -= [
-          "../browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc",
-          "../browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc",
-        ]
-      }
-    }
+
     if (is_mac) {
       # Other platforms only need .pak files, and can build this target
       # standalone much faster.
@@ -3148,6 +3124,9 @@ test("unit_tests") {
       "../browser/media/router/providers/dial/dial_media_route_provider_unittest.cc",
       "../browser/media/router/providers/extension/extension_media_route_provider_proxy_unittest.cc",
       "../browser/media/router/providers/wired_display/wired_display_media_route_provider_unittest.cc",
+      "../browser/media/webrtc/webrtc_log_uploader_unittest.cc",
+      "../browser/media/webrtc/webrtc_rtp_dump_handler_unittest.cc",
+      "../browser/media/webrtc/webrtc_rtp_dump_writer_unittest.cc",
       "../browser/policy/local_sync_policy_handler_unittest.cc",
       "../browser/renderer_context_menu/render_view_context_menu_test_util.cc",
       "../browser/renderer_context_menu/render_view_context_menu_test_util.h",
@@ -3174,6 +3153,7 @@ test("unit_tests") {
       "../common/media_router/discovery/media_sink_service_base_unittest.cc",
       "../common/media_router/mojo/media_router_struct_traits_unittest.cc",
       "../common/media_router/providers/cast/cast_media_source_unittest.cc",
+      "../renderer/media/chrome_webrtc_log_message_delegate_unittest.cc",
     ]
     deps += [
       "//components/bubble:test_support",
@@ -3902,14 +3882,6 @@ test("unit_tests") {
       ]
     }
   }
-  if (enable_webrtc) {
-    sources += [
-      "../browser/media/webrtc/webrtc_log_uploader_unittest.cc",
-      "../browser/media/webrtc/webrtc_rtp_dump_handler_unittest.cc",
-      "../browser/media/webrtc/webrtc_rtp_dump_writer_unittest.cc",
-      "../renderer/media/chrome_webrtc_log_message_delegate_unittest.cc",
-    ]
-  }
   if (is_chromeos) {
     deps += [
       "//chrome/browser/chromeos:unit_tests",

chrome/tools/service_discovery_sniffer/BUILD.gn

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//media/media_options.gni")
 
 executable("service_discovery_sniffer") {
   testonly = true
@@ -18,9 +17,6 @@ executable("service_discovery_sniffer") {
     "//build/config:exe_and_shlib_deps",
     "//chrome/browser",
     "//net",
+    "//third_party/webrtc_overrides:init_webrtc",
   ]
-
-  if (enable_webrtc) {
-    deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
-  }
 }

components/BUILD.gn

@@ -337,7 +337,7 @@ test("components_unittests") {
     deps += [ "//components/safe_browsing/android:unit_tests_mobile" ]
   }
 
-  if (enable_webrtc && !is_ios) {
+  if (!is_ios) {
     deps += [
       "//components/webrtc_logging/browser:unit_tests",
       "//components/webrtc_logging/common:unit_tests",

components/webrtc_logging/browser/BUILD.gn

@@ -2,10 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//media/media_options.gni")
-
-assert(enable_webrtc)
-
 source_set("browser") {
   sources = [
     "log_cleanup.cc",

components/webrtc_logging/common/BUILD.gn

@@ -2,10 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//media/media_options.gni")
-
-assert(enable_webrtc)
-
 source_set("common") {
   sources = [
     "partial_circular_buffer.cc",

content/browser/BUILD.gn

@@ -97,6 +97,7 @@ jumbo_source_set("browser") {
     "//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 @@ jumbo_source_set("browser") {
     "//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 @@ jumbo_source_set("browser") {
     "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 @@ jumbo_source_set("browser") {
     "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 @@ jumbo_source_set("browser") {
     "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 @@ jumbo_source_set("browser") {
     ]
   }
 
-  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 @@ jumbo_source_set("browser") {
     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 @@ jumbo_source_set("browser") {
       "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 @@ jumbo_source_set("browser") {
         "//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) {

content/common/BUILD.gn

@@ -7,7 +7,6 @@ import("//build/buildflag_header.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//ipc/features.gni")
-import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//sandbox/features.gni")
@@ -231,6 +230,8 @@ source_set("common") {
     "notifications/notification_struct_traits.cc",
     "notifications/notification_struct_traits.h",
     "origin_util.cc",
+    "p2p_messages.h",
+    "p2p_socket_type.h",
     "page_message_enums.h",
     "page_messages.h",
     "page_state_serialization.cc",
@@ -376,6 +377,8 @@ source_set("common") {
     "//third_party/angle:angle_gpu_info_util",
     "//third_party/boringssl",
     "//third_party/icu",
+    "//third_party/webrtc/rtc_base:rtc_base",
+    "//third_party/webrtc_overrides",
     "//ui/base",
     "//ui/base/ime",
     "//ui/display",
@@ -433,17 +436,6 @@ source_set("common") {
     deps += [ "//ppapi/proxy:ipc_sources" ]
   }
 
-  if (enable_webrtc) {
-    sources += [
-      "p2p_messages.h",
-      "p2p_socket_type.h",
-    ]
-    deps += [
-      "//third_party/webrtc/rtc_base:rtc_base",
-      "//third_party/webrtc_overrides",
-    ]
-  }
-
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   } else {

content/public/browser/BUILD.gn

@@ -4,7 +4,6 @@
 
 import("//build/config/jumbo.gni")
 import("//build/config/ui.gni")
-import("//media/media_options.gni")
 
 # See //content/BUILD.gn for how this works.
 group("browser") {
@@ -93,6 +92,8 @@ jumbo_source_set("browser_sources") {
     "content_browser_client.h",
     "context_factory.h",
     "cookie_store_factory.h",
+    "desktop_capture.cc",
+    "desktop_capture.h",
     "desktop_media_id.cc",
     "desktop_media_id.h",
     "devtools_agent_host.h",
@@ -300,6 +301,8 @@ jumbo_source_set("browser_sources") {
     "web_ui_url_loader_factory.h",
     "webrtc_event_logger.cc",
     "webrtc_event_logger.h",
+    "webrtc_log.cc",
+    "webrtc_log.h",
     "websocket_handshake_request_info.h",
     "webvr_service_provider.cc",
     "webvr_service_provider.h",
@@ -323,6 +326,7 @@ jumbo_source_set("browser_sources") {
     "//services/service_manager/public/cpp",
     "//services/tracing/public/cpp",
     "//services/ui/public/interfaces",
+    "//third_party/webrtc/modules/desktop_capture",
 
     # We expose skia headers in the public API.
     "//skia",
@@ -375,14 +379,4 @@ jumbo_source_set("browser_sources") {
       "zoom_level_delegate.h",
     ]
   }
-
-  if (enable_webrtc) {
-    sources += [
-      "desktop_capture.cc",
-      "desktop_capture.h",
-      "webrtc_log.cc",
-      "webrtc_log.h",
-    ]
-    public_deps += [ "//third_party/webrtc/modules/desktop_capture" ]
-  }
 }

content/public/common/BUILD.gn

@@ -8,7 +8,6 @@ import("//build/config/features.gni")
 import("//build/config/jumbo.gni")
 import("//build/config/ui.gni")
 import("//content/public/common/zygote_features.gni")
-import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//third_party/webrtc/webrtc.gni")
@@ -242,6 +241,8 @@ jumbo_source_set("common_sources") {
     "webplugininfo.cc",
     "webplugininfo.h",
     "webplugininfo_param_traits.h",
+    "webrtc_ip_handling_policy.cc",
+    "webrtc_ip_handling_policy.h",
     "zygote_fork_delegate_linux.h",
   ]
 
@@ -319,13 +320,6 @@ jumbo_source_set("common_sources") {
     ]
   }
 
-  if (enable_webrtc) {
-    sources += [
-      "webrtc_ip_handling_policy.cc",
-      "webrtc_ip_handling_policy.h",
-    ]
-  }
-
   if (use_zygote_handle) {
     sources += [ "zygote_handle.h" ]
   }

content/public/renderer/BUILD.gn

@@ -42,6 +42,16 @@ target(link_target_type, "renderer_sources") {
     "document_state.h",
     "fixed_received_data.cc",
     "fixed_received_data.h",
+    "media_stream_audio_renderer.h",
+    "media_stream_audio_sink.cc",
+    "media_stream_audio_sink.h",
+    "media_stream_renderer_factory.h",
+    "media_stream_sink.h",
+    "media_stream_utils.cc",
+    "media_stream_utils.h",
+    "media_stream_video_renderer.h",
+    "media_stream_video_sink.cc",
+    "media_stream_video_sink.h",
     "navigation_state.cc",
     "navigation_state.h",
     "pepper_plugin_instance.h",
@@ -72,6 +82,7 @@ target(link_target_type, "renderer_sources") {
     "v8_value_converter.h",
     "video_encode_accelerator.cc",
     "video_encode_accelerator.h",
+    "webrtc_log_message_delegate.h",
     "websocket_handshake_throttle_provider.h",
     "window_features_converter.cc",
     "window_features_converter.h",
@@ -86,7 +97,9 @@ target(link_target_type, "renderer_sources") {
 
   deps = [
     "//content/public/child:child_sources",
+    "//content/public/common:buildflags",
     "//content/public/common:common_sources",
+    "//content/public/common:feature_h264_with_openh264_ffmpeg",
     "//content/renderer",
     "//gin",
     "//media/capture",
@@ -96,6 +109,7 @@ target(link_target_type, "renderer_sources") {
     "//ppapi/c",
     "//skia",
     "//third_party/blink/public:blink_headers",
+    "//third_party/webrtc_overrides",
     "//third_party/widevine/cdm:headers",
     "//ui/base",
     "//ui/base/ime",
@@ -114,27 +128,6 @@ target(link_target_type, "renderer_sources") {
     deps += [ "//sandbox" ]
   }
 
-  if (enable_webrtc) {
-    sources += [
-      "media_stream_audio_renderer.h",
-      "media_stream_audio_sink.cc",
-      "media_stream_audio_sink.h",
-      "media_stream_renderer_factory.h",
-      "media_stream_sink.h",
-      "media_stream_utils.cc",
-      "media_stream_utils.h",
-      "media_stream_video_renderer.h",
-      "media_stream_video_sink.cc",
-      "media_stream_video_sink.h",
-      "webrtc_log_message_delegate.h",
-    ]
-    deps += [
-      "//content/public/common:buildflags",
-      "//content/public/common:feature_h264_with_openh264_ffmpeg",
-      "//third_party/webrtc_overrides",
-    ]
-  }
-
   if (enable_plugins) {
     sources += [ "plugin_instance_throttler.h" ]
   }

content/renderer/media/webrtc_logging_noop.cc

-// Copyright 2013 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/renderer/media/webrtc_logging.h"
-
-namespace content {
-
-void WebRtcLogMessage(const std::string& message) {}
-
-}  // namespace content

media/BUILD.gn

@@ -33,7 +33,9 @@ buildflag_header("media_buildflags") {
     "ENABLE_CDM_STORAGE_ID=$enable_cdm_storage_id",
     "ENABLE_MEDIA_REMOTING=$enable_media_remoting",
     "ENABLE_MEDIA_REMOTING_RPC=$enable_media_remoting_rpc",
-    "ENABLE_WEBRTC=$enable_webrtc",
+
+    # TODO(phoglund): Remove this define from the code.
+    "ENABLE_WEBRTC=true",
     "USE_PROPRIETARY_CODECS=$proprietary_codecs",
   ]
 }

media/audio/BUILD.gn

@@ -92,6 +92,8 @@ source_set("audio") {
     "audio_input_device.h",
     "audio_input_ipc.cc",
     "audio_input_ipc.h",
+    "audio_input_stream_data_interceptor.cc",
+    "audio_input_stream_data_interceptor.h",
     "audio_input_sync_writer.cc",
     "audio_input_sync_writer.h",
     "audio_io.h",
@@ -311,13 +313,6 @@ source_set("audio") {
     libs += [ "media_client" ]
   }
 
-  if (enable_webrtc) {
-    sources += [
-      "audio_input_stream_data_interceptor.cc",
-      "audio_input_stream_data_interceptor.h",
-    ]
-  }
-
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 }
 
@@ -385,6 +380,7 @@ source_set("unit_tests") {
     "audio_debug_recording_session_impl_unittest.cc",
     "audio_input_controller_unittest.cc",
     "audio_input_device_unittest.cc",
+    "audio_input_stream_data_interceptor_unittest.cc",
     "audio_input_sync_writer_unittest.cc",
     "audio_input_unittest.cc",
     "audio_manager_unittest.cc",
@@ -416,10 +412,6 @@ source_set("unit_tests") {
     "//media:media_config",
   ]
 
-  if (enable_webrtc) {
-    sources += [ "audio_input_stream_data_interceptor_unittest.cc" ]
-  }
-
   if (is_android) {
     sources += [ "android/audio_android_unittest.cc" ]
     deps += [ "//ui/gl" ]

media/gpu/BUILD.gn

@@ -152,6 +152,8 @@ component("gpu") {
       "android/android_image_reader_compat.h",
       "android/android_video_decode_accelerator.cc",
       "android/android_video_decode_accelerator.h",
+      "android/android_video_encode_accelerator.cc",
+      "android/android_video_encode_accelerator.h",
       "android/android_video_surface_chooser.h",
       "android/android_video_surface_chooser_impl.cc",
       "android/android_video_surface_chooser_impl.h",
@@ -202,14 +204,8 @@ component("gpu") {
       # TODO(crbug.com/789435): This can be removed once CdmManager is removed.
       "//media/mojo:buildflags",
       "//services/service_manager/public/cpp:cpp",
+      "//third_party/libyuv",
     ]
-    if (enable_webrtc) {
-      deps += [ "//third_party/libyuv" ]
-      sources += [
-        "android/android_video_encode_accelerator.cc",
-        "android/android_video_encode_accelerator.h",
-      ]
-    }
 
     # TODO(crbug.com/789435): This is needed for AVDA to access the CDM
     # directly.  Remove this dependency after VDAs are also running as part of

media/media_options.gni

@@ -71,8 +71,6 @@ declare_args() {
   # which are encoded using HEVC require |enable_hevc_demuxing| to be enabled.
   enable_dolby_vision_demuxing = proprietary_codecs && is_chromecast
 
-  enable_webrtc = true
-
   # Enable HLS with SAMPLE-AES decryption.
   enable_hls_sample_aes = proprietary_codecs && is_chromecast
 

remoting/BUILD.gn

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//components/nacl/features.gni")
-import("//media/media_options.gni")
 import("//remoting/build/config/remoting_build.gni")
 
 group("remoting_all") {
@@ -176,9 +175,7 @@ test("remoting_unittests") {
     ]
   }
 
-  if (enable_webrtc) {
-    deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
-  }
+  deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
 
   if (is_android) {
     deps += [ "//net/android:net_java" ]
@@ -221,9 +218,7 @@ if (enable_remoting_host) {
       "//third_party/webrtc_overrides",
     ]
 
-    if (enable_webrtc) {
-      deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
-    }
+    deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
 
     if (is_win) {
       defines += [ "_ALT_NO_EXCEPTIONS" ]

remoting/host/BUILD.gn

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/util/process_version.gni")
-import("//media/media_options.gni")
 import("//remoting/build/config/remoting_build.gni")
 
 group("all_tests") {
@@ -305,6 +304,7 @@ static_library("host") {
     "//remoting/host/security_key",
     "//remoting/protocol",
     "//remoting/resources",
+    "//third_party/webrtc/modules/desktop_capture",
 
     # //remoting uses the power_save_blocker directly. See crbug.com/689423
     "//services/device/wake_lock/power_save_blocker",
@@ -411,10 +411,6 @@ static_library("host") {
 
     public_deps += [ "//remoting/host/win" ]
   }
-
-  if (enable_webrtc) {
-    deps += [ "//third_party/webrtc/modules/desktop_capture" ]
-  }
 }
 
 static_library("test_support") {
@@ -441,16 +437,11 @@ static_library("test_support") {
   public_deps = [
     ":host",
     "//remoting/base:test_support",
+    "//third_party/libjingle_xmpp",
     "//third_party/protobuf:protobuf_lite",
+    "//third_party/webrtc/modules/desktop_capture",
+    "//third_party/webrtc_overrides:init_webrtc",
   ]
-
-  if (enable_webrtc) {
-    public_deps += [
-      "//third_party/libjingle_xmpp",
-      "//third_party/webrtc/modules/desktop_capture",
-      "//third_party/webrtc_overrides:init_webrtc",
-    ]
-  }
 }
 
 # The host portions of the remoting unit tests.
@@ -583,6 +574,8 @@ if (enable_remoting_host) {
 
     deps = [
       "//build/config:exe_and_shlib_deps",
+      "//third_party/libjingle_xmpp",
+      "//third_party/webrtc_overrides:init_webrtc",
     ]
 
     configs += [ "//build/config/compiler:wexit_time_destructors" ]
@@ -610,13 +603,6 @@ if (enable_remoting_host) {
         "//remoting/host/setup",
       ]
     }
-
-    if (enable_webrtc) {
-      deps += [
-        "//third_party/libjingle_xmpp",
-        "//third_party/webrtc_overrides:init_webrtc",
-      ]
-    }
   }
 
   action_foreach("remoting_native_messaging_manifests") {
@@ -718,7 +704,9 @@ if (enable_me2me_host) {
       "//remoting/base",
       "//remoting/host",
       "//remoting/proto",
+      "//third_party/libjingle_xmpp",
       "//third_party/webrtc/modules/desktop_capture",
+      "//third_party/webrtc_overrides:init_webrtc",
     ]
 
     if (is_posix) {
@@ -732,13 +720,6 @@ if (enable_me2me_host) {
       deps += [ "//components/policy:generated" ]
     }
 
-    if (enable_webrtc) {
-      deps += [
-        "//third_party/libjingle_xmpp",
-        "//third_party/webrtc_overrides:init_webrtc",
-      ]
-    }
-
     if (is_desktop_linux) {
       deps += [ "//build/config/linux/gtk" ]
     }

remoting/host/it2me/BUILD.gn

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//media/media_options.gni")
 import("//remoting/remoting_options.gni")
 import("//remoting/remoting_locales.gni")
 import("//remoting/remoting_version.gni")
@@ -207,6 +206,7 @@ if (!is_chromeos && enable_remoting_host) {
         "//remoting/host",
         "//remoting/host/native_messaging",
         "//remoting/proto",
+        "//third_party/webrtc_overrides:init_webrtc",
         "//ui/gfx",
       ]
       if (is_mac) {
@@ -227,10 +227,6 @@ if (!is_chromeos && enable_remoting_host) {
         }
       }
 
-      if (enable_webrtc) {
-        deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
-      }
-
       if (is_desktop_linux) {
         deps += [ "//build/config/linux/gtk" ]
       }

remoting/host/win/BUILD.gn

@@ -131,6 +131,7 @@ source_set("win") {
     "//remoting/protocol",
     "//remoting/resources",
     "//services/device/wake_lock/power_save_blocker",
+    "//third_party/webrtc/modules/desktop_capture",
     "//ui/base",
     "//ui/events:dom_keycode_converter",
     "//ui/events/platform",
@@ -139,10 +140,6 @@ source_set("win") {
   if (!is_ios) {
     deps += [ "//components/policy:generated" ]
   }
-
-  if (enable_webrtc) {
-    deps += [ "//third_party/webrtc/modules/desktop_capture" ]
-  }
 }
 
 source_set("unit_tests") {

remoting/remoting_enable.gni

@@ -3,12 +3,11 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
-import("//media/media_options.gni")
 
 if (is_ios) {
   import("//build/config/ios/ios_sdk.gni")
 }
 
 declare_args() {
-  enable_remoting = !is_chromecast && !is_fuchsia && enable_webrtc
+  enable_remoting = !is_chromecast && !is_fuchsia
 }