Remove RtpDemuxer tweak for preventing multiple RSID inspections

webrtc/call/rtp_demuxer.h

Index: webrtc/call/rtp_demuxer.h
diff --git a/webrtc/call/rtp_demuxer.h b/webrtc/call/rtp_demuxer.h
index 5060a80a70806afe46213592f62d0f05c534bf7e..e557c4dbcc0ab3978708c3a62a3062932da29657 100644
--- a/webrtc/call/rtp_demuxer.h
+++ b/webrtc/call/rtp_demuxer.h
@@ -12,7 +12,6 @@
 #define WEBRTC_CALL_RTP_DEMUXER_H_
 
 #include <map>
-#include <set>
 #include <string>
 #include <vector>
 
@@ -60,9 +59,6 @@ class RtpDemuxer {
   // packet reception.
   void RecordSsrcToSinkAssociation(uint32_t ssrc, RtpPacketSinkInterface* sink);
 
-  // When a new packet arrives, we attempt to resolve extra associations.
-  void ResolveAssociations(const RtpPacketReceived& packet);
-
   // Find the associations of RSID to SSRCs.
   void ResolveRsidToSsrcAssociations(const RtpPacketReceived& packet);
 
@@ -79,15 +75,6 @@ class RtpDemuxer {
   // from this container, and moved into |ssrc_sinks_|.
   std::multimap<std::string, RtpPacketSinkInterface*> rsid_sinks_;
 
-  // Iterating over |rsid_sinks_| for each incoming and performing multiple
-  // string comparisons is of non-trivial cost. To avoid this cost, we only
-  // check RSIDs for the first packet on each incoming SSRC stream.
-  // (If RSID associations are added later, we check again.)
-  std::set<uint32_t> processed_ssrcs_;
-
-  // Avoid an attack that would create excessive logging.
-  bool logged_max_processed_ssrcs_exceeded_ = false;
-
   // Observers which will be notified when an RSID association to an SSRC is
   // resolved by this object.
   std::vector<RsidResolutionObserver*> rsid_resolution_observers_;