Move RTP keep-alive config from VideoSendStream::Config to Call::Config

webrtc/video/video_send_stream_tests.cc

Index: webrtc/video/video_send_stream_tests.cc
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index aa9d2fb093adf544d76ec4c83c1483d03e2f25f6..53796b81874679dd3019b6cc030e529528528478 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -3415,6 +3415,14 @@ TEST_F(VideoSendStreamTest, SendsKeepAlive) {
    public:
     KeepaliveObserver() : SendTest(kDefaultTimeoutMs) {}
 
+    Call::Config GetSenderCallConfig() override {
+      Call::Config config = SendTest::GetSenderCallConfig();
+      config.keepalive_config.timeout_interval_ms = kTimeoutMs;
+      config.keepalive_config.payload_type =
+          CallTest::kDefaultKeepalivePayloadType;
+      return config;
+    }
+
    private:
     Action OnSendRtp(const uint8_t* packet, size_t length) override {
       RTPHeader header;
@@ -3431,15 +3439,6 @@ TEST_F(VideoSendStreamTest, SendsKeepAlive) {
       return SEND_PACKET;
     }
 
-    void ModifyVideoConfigs(
-        VideoSendStream::Config* send_config,
-        std::vector<VideoReceiveStream::Config>* receive_configs,
-        VideoEncoderConfig* encoder_config) override {
-      send_config->rtp.keep_alive.timeout_interval_ms = kTimeoutMs;
-      send_config->rtp.keep_alive.payload_type =
-          CallTest::kDefaultKeepalivePayloadType;
-    }
-
     void PerformTest() override {
       EXPECT_TRUE(Wait()) << "Timed out while waiting for keep-alive packet.";
     }