Cast: Simplify code path for RTCP sender report

media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h"
 
 #include <stdint.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
@@ skipping 55 matching lines @@
     ++packets_sent_;
     RtpHeaderParser parser(packet->data.data(), packet->data.size());
     RtpCastTestHeader rtp_header;
     parser.Parse(&rtp_header);
     VerifyRtpHeader(rtp_header);
     ++sequence_number_;
     ++expected_packet_id_;
     return true;
   }
 
-  int number_of_packets_received() const { return packets_sent_; }
+  size_t number_of_packets_received() const { return packets_sent_; }
 
-  void set_expected_number_of_packets(int expected_number_of_packets) {
+  void set_expected_number_of_packets(size_t expected_number_of_packets) {
     expected_number_of_packets_ = expected_number_of_packets;
   }
 
   void set_rtp_timestamp(uint32 rtp_timestamp) {
     expectd_rtp_timestamp_ = rtp_timestamp;
   }
 
   RtpPacketizerConfig config_;
   uint32 sequence_number_;
-  int packets_sent_;
-  int number_of_packets_;
-  int expected_number_of_packets_;
+  size_t packets_sent_;
+  size_t number_of_packets_;
+  size_t expected_number_of_packets_;
   // Assuming packets arrive in sequence.
   int expected_packet_id_;
   uint32 expected_frame_id_;
   uint32 expectd_rtp_timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRtpPacketTransport);
 };
 
 class RtpPacketizerTest : public ::testing::Test {
  protected:
@@ skipping 34 matching lines @@
   RtpPacketizerConfig config_;
   scoped_ptr<TestRtpPacketTransport> transport_;
   LoggingImpl logging_;
   scoped_ptr<PacedSender> pacer_;
   scoped_ptr<RtpPacketizer> rtp_packetizer_;
 
   DISALLOW_COPY_AND_ASSIGN(RtpPacketizerTest);
 };
 
 TEST_F(RtpPacketizerTest, SendStandardPackets) {
-  int expected_num_of_packets = kFrameSize / kMaxPacketLength + 1;
+  size_t expected_num_of_packets = kFrameSize / kMaxPacketLength + 1;
   transport_->set_expected_number_of_packets(expected_num_of_packets);
   transport_->set_rtp_timestamp(video_frame_.rtp_timestamp);
 
   base::TimeTicks time;
   time += base::TimeDelta::FromMilliseconds(kTimestampMs);
   rtp_packetizer_->IncomingEncodedVideoFrame(&video_frame_, time);
   RunTasks(33 + 1);
   EXPECT_EQ(expected_num_of_packets, transport_->number_of_packets_received());
 }
 
 TEST_F(RtpPacketizerTest, Stats) {
-  EXPECT_FALSE(rtp_packetizer_->send_packets_count());
+  EXPECT_FALSE(rtp_packetizer_->send_packet_count());
   EXPECT_FALSE(rtp_packetizer_->send_octet_count());
   // Insert packets at varying lengths.
-  int expected_num_of_packets = kFrameSize / kMaxPacketLength + 1;
+  size_t expected_num_of_packets = kFrameSize / kMaxPacketLength + 1;
   transport_->set_expected_number_of_packets(expected_num_of_packets);
   transport_->set_rtp_timestamp(video_frame_.rtp_timestamp);
 
   testing_clock_.Advance(base::TimeDelta::FromMilliseconds(kTimestampMs));
   rtp_packetizer_->IncomingEncodedVideoFrame(&video_frame_,
                                              testing_clock_.NowTicks());
   RunTasks(33 + 1);
-  EXPECT_EQ(expected_num_of_packets, rtp_packetizer_->send_packets_count());
+  EXPECT_EQ(expected_num_of_packets, rtp_packetizer_->send_packet_count());
   EXPECT_EQ(kFrameSize, rtp_packetizer_->send_octet_count());
   EXPECT_EQ(expected_num_of_packets, transport_->number_of_packets_received());
 }
 
 }  // namespace transport
 }  // namespace cast
 }  // namespace media