Fix setting of recovered flag in RtxReceiveStream.

webrtc/call/rtx_receive_stream_unittest.cc

Index: webrtc/call/rtx_receive_stream_unittest.cc
diff --git a/webrtc/call/rtx_receive_stream_unittest.cc b/webrtc/call/rtx_receive_stream_unittest.cc
index e9c82105212adec197b49f6298c1e345b5df3be5..54449de91805a5a722e30a6f031734a3169fe7aa 100644
--- a/webrtc/call/rtx_receive_stream_unittest.cc
+++ b/webrtc/call/rtx_receive_stream_unittest.cc
@@ -25,6 +25,7 @@ using ::testing::StrictMock;
 
 constexpr int kMediaPayloadType = 100;
 constexpr int kRtxPayloadType = 98;
+constexpr int kUnknownPayloadType = 90;
 constexpr uint32_t kMediaSSRC = 0x3333333;
 constexpr uint16_t kMediaSeqno = 0x5657;
 
@@ -55,8 +56,7 @@ constexpr uint8_t kRtxPacketWithCVO[] = {
 };
 
 std::map<int, int> PayloadTypeMapping() {
-  std::map<int, int> m;
-  m[kRtxPayloadType] = kMediaPayloadType;
+  static const std::map<int, int> m = {{kRtxPayloadType, kMediaPayloadType}};
   return m;
 }
 
@@ -86,7 +86,10 @@ TEST(RtxReceiveStreamTest, RestoresPacketPayload) {
 
 TEST(RtxReceiveStreamTest, IgnoresUnknownPayloadType) {
   StrictMock<MockRtpPacketSink> media_sink;
-  RtxReceiveStream rtx_sink(&media_sink, std::map<int, int>(), kMediaSSRC);
+  static const std::map<int, int> payload_type_mapping = {
+      {kUnknownPayloadType, kMediaPayloadType}};

[nisse-webrtc, 2017/08/30 07:29:23]

With the DCHECK changed to a log message, this test would pass with an empty
mapping. But it makes some sense to me to keep this change, and pass a non-empty
mapping with an unrelated payload type.

+
+  RtxReceiveStream rtx_sink(&media_sink, payload_type_mapping, kMediaSSRC);
   RtpPacketReceived rtx_packet;
   EXPECT_TRUE(rtx_packet.Parse(rtc::ArrayView<const uint8_t>(kRtxPacket)));
   rtx_sink.OnRtpPacket(rtx_packet);