Revert of Create RtcpDemuxer

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 9ec93787dea7ab9f533483319eb2596973983006..6a4370d73163573246b61f2b1179c12af1e2a4f0 100644
--- a/webrtc/call/rtp_demuxer.h
+++ b/webrtc/call/rtp_demuxer.h
@@ -14,11 +14,9 @@
 #include <map>
 #include <set>
 #include <string>
-#include <vector>
 
 namespace webrtc {
 
-class RsidResolutionObserver;
 class RtpPacketReceived;
 class RtpPacketSinkInterface;
 
@@ -43,15 +41,8 @@
   // Null pointer is not allowed.
   bool RemoveSink(const RtpPacketSinkInterface* sink);
 
-  // Returns true if at least one matching sink was found.
+  // Returns true if at least one matching sink was found, otherwise false.
   bool OnRtpPacket(const RtpPacketReceived& packet);
-
-  // Allows other objects to be notified when RSID-SSRC associations are
-  // resolved by this object.
-  void RegisterRsidResolutionObserver(RsidResolutionObserver* observer);
-
-  // Undo a previous RegisterRsidResolutionObserver().
-  void DeregisterRsidResolutionObserver(const RsidResolutionObserver* observer);
 
  private:
   // Records a sink<->SSRC association. This can happen by explicit
@@ -60,14 +51,9 @@
   // 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);
-
-  // Notify observers of the resolution of an RSID to an SSRC.
-  void NotifyObserversOfRsidResolution(const std::string& rsid, uint32_t ssrc);
+  // When a new packet arrives, we attempt to resolve extra associations,
+  // such as which RSIDs are associated with which SSRCs.
+  void FindSsrcAssociations(const RtpPacketReceived& packet);
 
   // This records the association SSRCs to sinks. Other associations, such
   // as by RSID, also end up here once the RSID, etc., is resolved to an SSRC.
@@ -87,10 +73,6 @@
 
   // 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_;
 };
 
 }  // namespace webrtc