FIXUP: Bring enable_webrtc back

Change-Id: If47d9bb5b77a369442b4df576629512fc8635144
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

4 files changed, 26 insertions, 3 deletions

diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn
index 0c2a8d33d23..deabc06c628 100644
--- a/chromium/chrome/test/BUILD.gn
+++ b/chromium/chrome/test/BUILD.gn
@@ -1920,10 +1920,7 @@ test("browser_tests") {
     } 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_browsertest_audio.cc",
-        "../browser/media/webrtc/webrtc_browsertest_audio.h",
         "../browser/media/webrtc/webrtc_browsertest_base.cc",
         "../browser/media/webrtc/webrtc_browsertest_base.h",
         "../browser/media/webrtc/webrtc_browsertest_common.cc",
@@ -1932,6 +1929,7 @@ test("browser_tests") {
         "../browser/media/webrtc/webrtc_browsertest_perf.h",
         "../browser/media/webrtc/webrtc_desktop_capture_browsertest.cc",
         "../browser/media/webrtc/webrtc_disable_encryption_flag_browsertest.cc",
+        "../browser/media/webrtc/webrtc_getdisplaymedia_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",
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 dff6349da2e..b4da92f6cfd 100644
--- a/chromium/content/browser/renderer_host/render_process_host_impl.cc
+++ b/chromium/content/browser/renderer_host/render_process_host_impl.cc
@@ -2271,10 +2271,12 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
       base::Unretained(storage_partition_impl_->GetAppCacheService()),
       GetID()));
 
+#if BUILDFLAG(ENABLE_WEBRTC)
   AddUIThreadInterface(
       registry.get(),
       base::BindRepeating(&P2PSocketDispatcherHost::BindRequest,
                           base::Unretained(p2p_socket_dispatcher_host_.get())));
+#endif
 
   AddUIThreadInterface(registry.get(), base::Bind(&FieldTrialRecorder::Create));
 
diff --git a/chromium/content/renderer/media/webrtc_logging_noop.cc b/chromium/content/renderer/media/webrtc_logging_noop.cc
new file mode 100644
index 00000000000..00bfdefbe3b
--- /dev/null
+++ b/chromium/content/renderer/media/webrtc_logging_noop.cc
@@ -0,0 +1,11 @@
+// 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/renderer_blink_platform_impl.cc b/chromium/content/renderer/renderer_blink_platform_impl.cc
index 34ec8d8c8a3..24c3d492949 100644
--- a/chromium/content/renderer/renderer_blink_platform_impl.cc
+++ b/chromium/content/renderer/renderer_blink_platform_impl.cc
@@ -856,32 +856,44 @@ bool RendererBlinkPlatformImpl::SetSandboxEnabledForTesting(bool enable) {
 
 scoped_refptr<base::SingleThreadTaskRunner>
 RendererBlinkPlatformImpl::GetWebRtcWorkerThread() {
+#if BUILDFLAG(ENABLE_WEBRTC)
   RenderThreadImpl* render_thread = RenderThreadImpl::current();
   DCHECK(render_thread);
   PeerConnectionDependencyFactory* rtc_dependency_factory =
       render_thread->GetPeerConnectionDependencyFactory();
   rtc_dependency_factory->EnsureInitialized();
   return rtc_dependency_factory->GetWebRtcWorkerThread();
+#else
+  return nullptr;
+#endif
 }
 
 rtc::Thread* RendererBlinkPlatformImpl::GetWebRtcWorkerThreadRtcThread() {
+#if BUILDFLAG(ENABLE_WEBRTC)
   RenderThreadImpl* render_thread = RenderThreadImpl::current();
   DCHECK(render_thread);
   PeerConnectionDependencyFactory* rtc_dependency_factory =
       render_thread->GetPeerConnectionDependencyFactory();
   rtc_dependency_factory->EnsureInitialized();
   return rtc_dependency_factory->GetWebRtcWorkerThreadRtcThread();
+#else
+  return nullptr;
+#endif
 }
 
 std::unique_ptr<cricket::PortAllocator>
 RendererBlinkPlatformImpl::CreateWebRtcPortAllocator(
     blink::WebLocalFrame* frame) {
+#if BUILDFLAG(ENABLE_WEBRTC)
   RenderThreadImpl* render_thread = RenderThreadImpl::current();
   DCHECK(render_thread);
   PeerConnectionDependencyFactory* rtc_dependency_factory =
       render_thread->GetPeerConnectionDependencyFactory();
   rtc_dependency_factory->EnsureInitialized();
   return rtc_dependency_factory->CreatePortAllocator(frame);
+#else
+  return nullptr;
+#endif
 }
 
 //------------------------------------------------------------------------------