Remove some media/ --> pc/ test dependencies

pc/ depends on media/, so the media/ tests should not have circular
dependencies on pc/.

Bug: None
Change-Id: I849cefecd91e9cd11415bbd93465a98dead735d9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/139361
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28115}

media/BUILD.gn

diff --git a/media/BUILD.gn b/media/BUILD.gn
index 5cf4175..cdae182 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -282,7 +282,6 @@
     "../modules/video_coding",
     "../modules/video_coding:video_codec_interface",
     "../modules/video_coding:video_coding_utility",
-    "../pc:rtc_pc_base",
     "../rtc_base",
     "../rtc_base:audio_format_to_string",
     "../rtc_base:checks",
@@ -540,8 +539,6 @@
       "../modules/video_coding:video_codec_interface",
       "../modules/video_coding:webrtc_vp8",
       "../p2p:p2p_test_utils",
-      "../pc:rtc_pc",
-      "../pc:rtc_pc_base",
       "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",

media/DEPS

diff --git a/media/DEPS b/media/DEPS
index e3e03c5..1e13c18 100644
--- a/media/DEPS
+++ b/media/DEPS
@@ -11,7 +11,6 @@
   "+modules/video_coding",
   "+modules/video_coding/utility",
   "+p2p",
-  "+pc",
   "+sound",
   "+system_wrappers",
   "+usrsctplib",

media/engine/webrtc_voice_engine.cc

diff --git a/media/engine/webrtc_voice_engine.cc b/media/engine/webrtc_voice_engine.cc
index 55a2826..0635c9f 100644
--- a/media/engine/webrtc_voice_engine.cc
+++ b/media/engine/webrtc_voice_engine.cc
@@ -609,10 +609,10 @@
   return audio_state_.get();
 }
 
-AudioCodecs WebRtcVoiceEngine::CollectCodecs(
+std::vector<AudioCodec> WebRtcVoiceEngine::CollectCodecs(
     const std::vector<webrtc::AudioCodecSpec>& specs) const {
   PayloadTypeMapper mapper;
-  AudioCodecs out;
+  std::vector<AudioCodec> out;
 
   // Only generate CN payload types for these clockrates:
   std::map<int, bool, std::greater<int>> generate_cn = {
@@ -622,7 +622,7 @@
       {8000, false}, {16000, false}, {32000, false}, {48000, false}};
 
   auto map_format = [&mapper](const webrtc::SdpAudioFormat& format,
-                              AudioCodecs* out) {
+                              std::vector<AudioCodec>* out) {
     absl::optional<AudioCodec> opt_codec = mapper.ToAudioCodec(format);
     if (opt_codec) {
       if (out) {

media/engine/webrtc_voice_engine.h

diff --git a/media/engine/webrtc_voice_engine.h b/media/engine/webrtc_voice_engine.h
index eb9f3ad..aaa2778 100644
--- a/media/engine/webrtc_voice_engine.h
+++ b/media/engine/webrtc_voice_engine.h
@@ -22,10 +22,9 @@
 #include "api/task_queue/task_queue_factory.h"
 #include "call/audio_state.h"
 #include "call/call.h"
+#include "media/base/media_engine.h"
 #include "media/base/rtp_utils.h"
 #include "media/engine/apm_helpers.h"
-#include "modules/audio_processing/include/audio_processing.h"
-#include "pc/channel.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/experiments/audio_allocation_settings.h"
@@ -99,7 +98,7 @@
   webrtc::AudioProcessing* apm() const;
   webrtc::AudioState* audio_state();
 
-  AudioCodecs CollectCodecs(
+  std::vector<AudioCodec> CollectCodecs(
       const std::vector<webrtc::AudioCodecSpec>& specs) const;
 
   rtc::ThreadChecker signal_thread_checker_;

media/engine/webrtc_voice_engine_unittest.cc

diff --git a/media/engine/webrtc_voice_engine_unittest.cc b/media/engine/webrtc_voice_engine_unittest.cc
index 65f3c7b..3cbad9f 100644
--- a/media/engine/webrtc_voice_engine_unittest.cc
+++ b/media/engine/webrtc_voice_engine_unittest.cc
@@ -28,7 +28,6 @@
 #include "media/engine/webrtc_voice_engine.h"
 #include "modules/audio_device/include/mock_audio_device.h"
 #include "modules/audio_processing/include/mock_audio_processing.h"
-#include "pc/channel.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/byte_order.h"
 #include "rtc_base/numerics/safe_conversions.h"