Fix flaky test VideoSendStreamTest.SendsKeepAlive

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 3206c405876757d532ee95f3f799264a41b2e0ea..aa9d2fb093adf544d76ec4c83c1483d03e2f25f6 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -3410,7 +3410,6 @@ TEST_F(VideoSendStreamTest, RemoveOverheadFromBandwidth) {
 
 TEST_F(VideoSendStreamTest, SendsKeepAlive) {
   const int kTimeoutMs = 50;  // Really short timeout for testing.
-  const int kPayloadType = 20;
 
   class KeepaliveObserver : public test::SendTest {
    public:
@@ -3421,7 +3420,7 @@ TEST_F(VideoSendStreamTest, SendsKeepAlive) {
       RTPHeader header;
       EXPECT_TRUE(parser_->Parse(packet, length, &header));
 
-      if (header.payloadType != kPayloadType) {
+      if (header.payloadType != CallTest::kDefaultKeepalivePayloadType) {
         // The video stream has started. Stop it now.
         if (capturer_)
           capturer_->Stop();
@@ -3437,7 +3436,8 @@ TEST_F(VideoSendStreamTest, SendsKeepAlive) {
         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 = kPayloadType;
+      send_config->rtp.keep_alive.payload_type =
+          CallTest::kDefaultKeepalivePayloadType;
     }
 
     void PerformTest() override {