[rtp_rtcp] rtcp::Fir moved into own file

webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
similarity index 56%
copy from webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
copy to webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
index 6d71caa251652bf640deb65419cdc12f393d3651..a541fc607a96a8bc105266c24a550d46e119eca7 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
@@ -8,36 +8,35 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h"
+#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h"
 
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-
-#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/test/rtcp_packet_parser.h"
 
+using webrtc::rtcp::Fir;
 using webrtc::rtcp::RawPacket;
-using webrtc::rtcp::Tmmbr;
 using webrtc::test::RtcpPacketParser;
 
 namespace webrtc {
+
 const uint32_t kSenderSsrc = 0x12345678;
 const uint32_t kRemoteSsrc = 0x23456789;
 
-TEST(RtcpPacketTest, Tmmbr) {
-  Tmmbr tmmbr;
-  tmmbr.From(kSenderSsrc);
-  tmmbr.To(kRemoteSsrc);
-  tmmbr.WithBitrateKbps(312);
-  tmmbr.WithOverhead(60);
+TEST(RtcpPacketTest, Fir) {

[åsapersson, 2016/01/15 10:48:04]

s/RtcpPacketTest/RtcpPacketFirTest

+  Fir fir;
+  fir.From(kSenderSsrc);
+  fir.To(kRemoteSsrc);
+  fir.WithCommandSeqNum(123);
 
-  rtc::scoped_ptr<RawPacket> packet(tmmbr.Build());
+  rtc::scoped_ptr<RawPacket> packet(fir.Build());
   RtcpPacketParser parser;
   parser.Parse(packet->Buffer(), packet->Length());
-  EXPECT_EQ(1, parser.tmmbr()->num_packets());
-  EXPECT_EQ(kSenderSsrc, parser.tmmbr()->Ssrc());
-  EXPECT_EQ(1, parser.tmmbr_item()->num_packets());
-  EXPECT_EQ(312U, parser.tmmbr_item()->BitrateKbps());
-  EXPECT_EQ(60U, parser.tmmbr_item()->Overhead());
+  EXPECT_EQ(1, parser.fir()->num_packets());
+  EXPECT_EQ(kSenderSsrc, parser.fir()->Ssrc());
+  EXPECT_EQ(1, parser.fir_item()->num_packets());
+  EXPECT_EQ(kRemoteSsrc, parser.fir_item()->Ssrc());
+  EXPECT_EQ(123U, parser.fir_item()->SeqNum());
 }
 
 }  // namespace webrtc