FIXUP: Bring enable_webrtc back

Was missing fixes for building with with enable_webrtc disabled

Change-Id: Ib2c8a62dabd998179204d8ef67bd7b0cfb30b917
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

11 files changed, 22 insertions, 25 deletions

diff --git a/chromium/chrome/common/BUILD.gn b/chromium/chrome/common/BUILD.gn
index 76f8abd24b9..1d56a194972 100644
--- a/chromium/chrome/common/BUILD.gn
+++ b/chromium/chrome/common/BUILD.gn
@@ -489,9 +489,6 @@ static_library("common") {
       "pepper_permission_util.h",
     ]
   }
-  if (!enable_webrtc) {
-    sources -= [ "media/webrtc_logging_messages.h" ]
-  }
 
   if (enable_widevine && enable_library_cdms) {
     deps += [ "//third_party/widevine/cdm:headers" ]
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn
index 088c4f87c7d..424f00576cc 100644
--- a/chromium/content/browser/BUILD.gn
+++ b/chromium/content/browser/BUILD.gn
@@ -1181,8 +1181,6 @@ jumbo_source_set("browser") {
     "loader/upload_data_stream_builder.h",
     "loader/url_loader_factory_impl.cc",
     "loader/url_loader_factory_impl.h",
-    "loader/webrtc_connections_observer.cc",
-    "loader/webrtc_connections_observer.h",
     "loader_delegate_impl.cc",
     "loader_delegate_impl.h",
     "locks/lock_manager.cc",
@@ -1535,8 +1533,6 @@ jumbo_source_set("browser") {
     "renderer_host/input_event_shim.h",
     "renderer_host/legacy_render_widget_host_win.cc",
     "renderer_host/legacy_render_widget_host_win.h",
-    "renderer_host/media/aec_dump_manager_impl.cc",
-    "renderer_host/media/aec_dump_manager_impl.h",
     "renderer_host/media/audio_input_delegate_impl.cc",
     "renderer_host/media/audio_input_delegate_impl.h",
     "renderer_host/media/audio_input_device_manager.cc",
@@ -2081,6 +2077,10 @@ jumbo_source_set("browser") {
 
   if (enable_webrtc) {
     sources += [
+      "loader/webrtc_connections_observer.cc",
+      "loader/webrtc_connections_observer.h",
+      "renderer_host/media/aec_dump_manager_impl.cc",
+      "renderer_host/media/aec_dump_manager_impl.h",
       "renderer_host/media/ref_counted_video_source_provider.cc",
       "renderer_host/media/ref_counted_video_source_provider.h",
       "renderer_host/media/peer_connection_tracker_host.cc",
diff --git a/chromium/content/browser/builtin_service_manifests.cc b/chromium/content/browser/builtin_service_manifests.cc
index 07e202925d5..c985c6396bf 100644
--- a/chromium/content/browser/builtin_service_manifests.cc
+++ b/chromium/content/browser/builtin_service_manifests.cc
@@ -91,12 +91,14 @@ const std::vector<service_manager::Manifest>& GetBuiltinServiceManifests() {
           resource_coordinator::GetManifest(),
           shape_detection::GetManifest(),
           tracing::GetManifest(),
+#if BUILDFLAG(ENABLE_WEBRTC)
           video_capture::GetManifest(
               features::IsVideoCaptureServiceEnabledForOutOfProcess()
                   ? service_manager::Manifest::ExecutionMode::
                         kOutOfProcessBuiltin
                   : service_manager::Manifest::ExecutionMode::
                         kInProcessBuiltin),
+#endif
 #if defined(OS_LINUX)
           font_service::GetManifest(),
 #endif
diff --git a/chromium/content/browser/network_service_client.cc b/chromium/content/browser/network_service_client.cc
index b89e764feb0..0ae0894c399 100644
--- a/chromium/content/browser/network_service_client.cc
+++ b/chromium/content/browser/network_service_client.cc
@@ -461,10 +461,12 @@ NetworkServiceClient::NetworkServiceClient(
 #endif
   }
 
+#if BUILDFLAG(ENABLE_WEBRTC)
   webrtc_connections_observer_ =
       std::make_unique<content::WebRtcConnectionsObserver>(base::BindRepeating(
           &NetworkServiceClient::OnPeerToPeerConnectionsCountChange,
           base::Unretained(this)));
+#endif
 }
 
 NetworkServiceClient::~NetworkServiceClient() {
diff --git a/chromium/content/browser/network_service_client.h b/chromium/content/browser/network_service_client.h
index 0517ef64a1a..aa68495344b 100644
--- a/chromium/content/browser/network_service_client.h
+++ b/chromium/content/browser/network_service_client.h
@@ -14,6 +14,7 @@
 #include "base/unguessable_token.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
+#include "media/media_buildflags.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "net/cert/cert_database.h"
 #include "services/network/public/mojom/network_service.mojom.h"
@@ -134,7 +135,9 @@ class CONTENT_EXPORT NetworkServiceClient
 
   std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
 
+#if BUILDFLAG(ENABLE_WEBRTC)
   std::unique_ptr<WebRtcConnectionsObserver> webrtc_connections_observer_;
+#endif
 
 #if defined(OS_ANDROID)
   std::unique_ptr<base::android::ApplicationStatusListener>
diff --git a/chromium/content/browser/renderer_host/render_process_host_impl.cc b/chromium/content/browser/renderer_host/render_process_host_impl.cc
index f40bef410a1..7a386c0fc5c 100644
--- a/chromium/content/browser/renderer_host/render_process_host_impl.cc
+++ b/chromium/content/browser/renderer_host/render_process_host_impl.cc
@@ -2242,10 +2242,12 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
       base::BindRepeating(&RenderProcessHostImpl::BindVideoDecoderService,
                           base::Unretained(this)));
 
+#if BUILDFLAG(ENABLE_WEBRTC)
   AddUIThreadInterface(
       registry.get(),
       base::BindRepeating(&AecDumpManagerImpl::AddRequest,
                           base::Unretained(&aec_dump_manager_)));
+#endif
 
   // ---- Please do not register interfaces below this line ------
   //
@@ -4508,8 +4510,10 @@ void RenderProcessHostImpl::OnProcessLaunched() {
       observer.RenderProcessReady(this);
   }
 
+#if BUILDFLAG(ENABLE_WEBRTC)
   aec_dump_manager_.set_pid(GetProcess().Pid());
   aec_dump_manager_.AutoStart();
+#endif
 }
 
 void RenderProcessHostImpl::OnProcessLaunchFailed(int error_code) {
diff --git a/chromium/content/renderer/BUILD.gn b/chromium/content/renderer/BUILD.gn
index 8f967e8d7fc..6fa420b593a 100644
--- a/chromium/content/renderer/BUILD.gn
+++ b/chromium/content/renderer/BUILD.gn
@@ -682,11 +682,6 @@ target(link_target_type, "renderer") {
       "//third_party/webrtc_overrides:init_webrtc",
       "//third_party/webrtc_overrides:task_queue_factory",
     ]
-  } else {
-    sources += [
-      "media/webrtc_logging.h",
-      "media/webrtc_logging_noop.cc",
-    ]
   }
 
   if (enable_plugins) {
diff --git a/chromium/content/renderer/media/webrtc_logging_noop.cc b/chromium/content/renderer/media/webrtc_logging_noop.cc
deleted file mode 100644
index 00bfdefbe3b..00000000000
--- a/chromium/content/renderer/media/webrtc_logging_noop.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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
diff --git a/chromium/content/renderer/pepper/pepper_media_device_manager.cc b/chromium/content/renderer/pepper/pepper_media_device_manager.cc
index 4a778f6b303..126da7fb36c 100644
--- a/chromium/content/renderer/pepper/pepper_media_device_manager.cc
+++ b/chromium/content/renderer/pepper/pepper_media_device_manager.cc
@@ -122,7 +122,8 @@ void PepperMediaDeviceManager::EnumerateDevices(PP_DeviceType_Dev type,
       FROM_HERE, base::BindOnce(&PepperMediaDeviceManager::DevicesEnumerated,
                                 AsWeakPtr(), std::move(callback), ToMediaDeviceType(type),
                                 std::vector<blink::WebMediaDeviceInfoArray>(),
-                                std::vector<blink::mojom::VideoInputDeviceCapabilitiesPtr>()));
+                                std::vector<blink::mojom::VideoInputDeviceCapabilitiesPtr>(),
+                                std::vector<blink::mojom::AudioInputDeviceCapabilitiesPtr>()));
 #endif
 }
 
diff --git a/chromium/content/renderer/render_thread_impl.cc b/chromium/content/renderer/render_thread_impl.cc
index 913fa2de98b..74b1cf2057e 100644
--- a/chromium/content/renderer/render_thread_impl.cc
+++ b/chromium/content/renderer/render_thread_impl.cc
@@ -762,9 +762,11 @@ void RenderThreadImpl::Init() {
   unfreezable_message_filter_ = new UnfreezableMessageFilter(this);
   AddFilter(unfreezable_message_filter_.get());
 
+#if BUILDFLAG(ENABLE_WEBRTC)
   audio_input_ipc_factory_.emplace(main_thread_runner(), GetIOTaskRunner());
 
   audio_output_ipc_factory_.emplace(GetIOTaskRunner());
+#endif
 
   registry->AddInterface(base::BindRepeating(&SharedWorkerFactoryImpl::Create),
                          base::ThreadTaskRunnerHandle::Get());
diff --git a/chromium/content/renderer/render_thread_impl.h b/chromium/content/renderer/render_thread_impl.h
index d4f31805feb..a5820808432 100644
--- a/chromium/content/renderer/render_thread_impl.h
+++ b/chromium/content/renderer/render_thread_impl.h
@@ -592,20 +592,22 @@ class CONTENT_EXPORT RenderThreadImpl
 
   // Dispatches all P2P sockets.
   scoped_refptr<P2PSocketDispatcher> p2p_socket_dispatcher_;
+#endif
 
   // Filter out unfreezable messages and pass it to unfreezable task runners.
   scoped_refptr<UnfreezableMessageFilter> unfreezable_message_filter_;
 
+#if BUILDFLAG(ENABLE_WEBRTC)
   // Provides AudioInputIPC objects for audio input devices. Initialized in
   // Init.
   base::Optional<AudioInputIPCFactory> audio_input_ipc_factory_;
   // Provides AudioOutputIPC objects for audio output devices. Initialized in
   // Init.
   base::Optional<AudioOutputIPCFactory> audio_output_ipc_factory_;
+#endif
 
   // Used on the render thread.
   std::unique_ptr<VideoCaptureImplManager> vc_manager_;
-#endif
 
   // Used to keep track of the renderer's backgrounded and visibility state.
   // Updated via an IPC from the browser process. If nullopt, the browser