2 files changed, 5 insertions, 10 deletions
diff --git a/third_party/libwebrtc/examples/androidnativeapi/BUILD.gn b/third_party/libwebrtc/examples/androidnativeapi/BUILD.gn
index e0eb6d8b24..d1088b3e61 100644
--- a/third_party/libwebrtc/examples/androidnativeapi/BUILD.gn
+++ b/third_party/libwebrtc/examples/androidnativeapi/BUILD.gn
@@ -47,6 +47,7 @@ if (is_android) {
 
     deps = [
       ":generated_jni",
+      "../../api:enable_media_with_defaults",
       "../../api:scoped_refptr",
       "../../api:sequence_checker",
       "../../rtc_base:ssl",
@@ -56,7 +57,6 @@ if (is_android) {
       "//api/task_queue:default_task_queue_factory",
       "//media:rtc_audio_video",
       "//media:rtc_internal_video_codecs",
-      "//media:rtc_media_engine_defaults",
       "//modules/utility",
       "//pc:libjingle_peerconnection",
       "//sdk/android:native_api_base",
diff --git a/third_party/libwebrtc/examples/androidnativeapi/jni/android_call_client.cc b/third_party/libwebrtc/examples/androidnativeapi/jni/android_call_client.cc
index 2713a563cd..40af78cdac 100644
--- a/third_party/libwebrtc/examples/androidnativeapi/jni/android_call_client.cc
+++ b/third_party/libwebrtc/examples/androidnativeapi/jni/android_call_client.cc
@@ -13,6 +13,7 @@
 #include <memory>
 #include <utility>
 
+#include "api/enable_media_with_defaults.h"
 #include "api/peer_connection_interface.h"
 #include "api/rtc_event_log/rtc_event_log_factory.h"
 #include "api/task_queue/default_task_queue_factory.h"
@@ -20,7 +21,6 @@
 #include "media/engine/internal_decoder_factory.h"
 #include "media/engine/internal_encoder_factory.h"
 #include "media/engine/webrtc_media_engine.h"
-#include "media/engine/webrtc_media_engine_defaults.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/native_api/video/wrapper.h"
 
@@ -154,19 +154,14 @@ void AndroidCallClient::CreatePeerConnectionFactory() {
   pcf_deps.worker_thread = worker_thread_.get();
   pcf_deps.signaling_thread = signaling_thread_.get();
   pcf_deps.task_queue_factory = webrtc::CreateDefaultTaskQueueFactory();
-  pcf_deps.call_factory = webrtc::CreateCallFactory();
   pcf_deps.event_log_factory = std::make_unique<webrtc::RtcEventLogFactory>(
       pcf_deps.task_queue_factory.get());
 
-  cricket::MediaEngineDependencies media_deps;
-  media_deps.task_queue_factory = pcf_deps.task_queue_factory.get();
-  media_deps.video_encoder_factory =
+  pcf_deps.video_encoder_factory =
       std::make_unique<webrtc::InternalEncoderFactory>();
-  media_deps.video_decoder_factory =
+  pcf_deps.video_decoder_factory =
       std::make_unique<webrtc::InternalDecoderFactory>();
-  webrtc::SetMediaEngineDefaults(&media_deps);
-  pcf_deps.media_engine = cricket::CreateMediaEngine(std::move(media_deps));
-  RTC_LOG(LS_INFO) << "Media engine created: " << pcf_deps.media_engine.get();
+  EnableMediaWithDefaults(pcf_deps);
 
   pcf_ = CreateModularPeerConnectionFactory(std::move(pcf_deps));
   RTC_LOG(LS_INFO) << "PeerConnectionFactory created: " << pcf_.get();