| Index: webrtc/modules/rtp_rtcp/source/rtcp_packet.h | 
| diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet.h | 
| index 2956bc7beabe5c4fbb14fdb345ea77c5bd456544..add672b4b19b00f667938ff42a35206ea33d5842 100644 | 
| --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet.h | 
| +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet.h | 
| @@ -364,62 +364,6 @@ class Ij : public RtcpPacket { | 
| RTC_DISALLOW_COPY_AND_ASSIGN(Ij); | 
| }; | 
|  | 
| -// Source Description (SDES) (RFC 3550). | 
| -// | 
| -//         0                   1                   2                   3 | 
| -//         0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 | 
| -//        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | 
| -// header |V=2|P|    SC   |  PT=SDES=202  |             length            | | 
| -//        +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ | 
| -// chunk  |                          SSRC/CSRC_1                          | | 
| -//   1    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | 
| -//        |                           SDES items                          | | 
| -//        |                              ...                              | | 
| -//        +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ | 
| -// chunk  |                          SSRC/CSRC_2                          | | 
| -//   2    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | 
| -//        |                           SDES items                          | | 
| -//        |                              ...                              | | 
| -//        +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ | 
| -// | 
| -// Canonical End-Point Identifier SDES Item (CNAME) | 
| -// | 
| -//    0                   1                   2                   3 | 
| -//    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 | 
| -//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | 
| -//   |    CNAME=1    |     length    | user and domain name        ... | 
| -//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | 
| - | 
| -class Sdes : public RtcpPacket { | 
| - public: | 
| -  Sdes() : RtcpPacket() {} | 
| - | 
| -  virtual ~Sdes() {} | 
| - | 
| -  bool WithCName(uint32_t ssrc, const std::string& cname); | 
| - | 
| -  struct Chunk { | 
| -    uint32_t ssrc; | 
| -    std::string name; | 
| -    int null_octets; | 
| -  }; | 
| - | 
| - protected: | 
| -  bool Create(uint8_t* packet, | 
| -              size_t* index, | 
| -              size_t max_length, | 
| -              RtcpPacket::PacketReadyCallback* callback) const override; | 
| - | 
| - private: | 
| -  static const int kMaxNumberOfChunks = 0x1f; | 
| - | 
| -  size_t BlockLength() const; | 
| - | 
| -  std::vector<Chunk> chunks_; | 
| - | 
| -  RTC_DISALLOW_COPY_AND_ASSIGN(Sdes); | 
| -}; | 
| - | 
| // | 
| // Bye packet (BYE) (RFC 3550). | 
| // | 
|  |