Stop leaking FlexfecReceiveStream objects after call shutdown.

webrtc/media/engine/fakewebrtccall.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 360 matching lines @@
 
 const FakeAudioReceiveStream* FakeCall::GetAudioReceiveStream(uint32_t ssrc) {
   for (const auto* p : GetAudioReceiveStreams()) {
     if (p->GetConfig().rtp.remote_ssrc == ssrc) {
       return p;
     }
   }
   return nullptr;
 }
 
-const std::list<FakeFlexfecReceiveStream>&
+const std::vector<FakeFlexfecReceiveStream*>&
 FakeCall::GetFlexfecReceiveStreams() {
   return flexfec_receive_streams_;
 }
 
 webrtc::NetworkState FakeCall::GetNetworkState(webrtc::MediaType media) const {
   switch (media) {
     case webrtc::MediaType::AUDIO:
       return audio_network_state_;
     case webrtc::MediaType::VIDEO:
       return video_network_state_;
@@ skipping 87 matching lines @@
   if (it == video_receive_streams_.end()) {
     ADD_FAILURE() << "DestroyVideoReceiveStream called with unknown parameter.";
   } else {
     delete *it;
     video_receive_streams_.erase(it);
   }
 }
 
 webrtc::FlexfecReceiveStream* FakeCall::CreateFlexfecReceiveStream(
     const webrtc::FlexfecReceiveStream::Config& config) {
-  flexfec_receive_streams_.push_back(FakeFlexfecReceiveStream(config));
+  FakeFlexfecReceiveStream* fake_stream = new FakeFlexfecReceiveStream(config);
+  flexfec_receive_streams_.push_back(fake_stream);
   ++num_created_receive_streams_;
-  return &flexfec_receive_streams_.back();
+  return fake_stream;
 }
 
 void FakeCall::DestroyFlexfecReceiveStream(
     webrtc::FlexfecReceiveStream* receive_stream) {
-  for (auto it = flexfec_receive_streams_.begin();
-       it != flexfec_receive_streams_.end(); ++it) {
-    if (&(*it) == receive_stream) {
-      flexfec_receive_streams_.erase(it);
-      return;
-    }
+  auto it = std::find(flexfec_receive_streams_.begin(),
+                      flexfec_receive_streams_.end(),
+                      static_cast<FakeFlexfecReceiveStream*>(receive_stream));
+  if (it == flexfec_receive_streams_.end()) {
+    ADD_FAILURE()
+        << "DestroyFlexfecReceiveStream called with unknown parameter.";
+  } else {
+    delete *it;
+    flexfec_receive_streams_.erase(it);
   }
-  ADD_FAILURE() << "DestroyFlexfecReceiveStream called with unknown parameter.";
 }
 
 webrtc::PacketReceiver* FakeCall::Receiver() {
   return this;
 }
 
 FakeCall::DeliveryStatus FakeCall::DeliverPacket(
     webrtc::MediaType media_type,
     const uint8_t* packet,
     size_t length,
@@ skipping 76 matching lines @@
 }
 
 void FakeCall::OnSentPacket(const rtc::SentPacket& sent_packet) {
   last_sent_packet_ = sent_packet;
   if (sent_packet.packet_id >= 0) {
     last_sent_nonnegative_packet_id_ = sent_packet.packet_id;
   }
 }
 
 }  // namespace cricket