Unify Transport and newapi::Transport interfaces.

webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
index d33b086eb25f39479c2740061bc170cba4d0a87a..b8d2214a26ffac33eff04f4f3cc4e2147b56fa0f 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
@@ -78,7 +78,7 @@ class LoopbackTransportTest : public webrtc::Transport {
   ~LoopbackTransportTest() {
     STLDeleteContainerPointers(sent_packets_.begin(), sent_packets_.end());
   }
-  int SendPacket(const void *data, size_t len) override {
+  bool SendRtp(const uint8_t *data, size_t len) override {
     packets_sent_++;
     rtc::Buffer* buffer =
         new rtc::Buffer(reinterpret_cast<const uint8_t*>(data), len);
@@ -88,7 +88,7 @@ class LoopbackTransportTest : public webrtc::Transport {
     sent_packets_.push_back(buffer);
     return static_cast<int>(len);
   }
-  int SendRTCPPacket(const void* data, size_t len) override {
+  bool SendRtcp(const uint8_t* data, size_t len) override {
     return -1;
   }
   int packets_sent_;
@@ -864,26 +864,26 @@ TEST_F(RtpSenderTest, SendRedundantPayloads) {
   // Send 10 packets of increasing size.
   for (size_t i = 0; i < kNumPayloadSizes; ++i) {
     int64_t capture_time_ms = fake_clock_.TimeInMilliseconds();
-    EXPECT_CALL(transport, SendPacket(_, _)).WillOnce(testing::ReturnArg<1>());
+    EXPECT_CALL(transport, SendRtp(_, _)).WillOnce(testing::Return(true));
     SendPacket(capture_time_ms, kPayloadSizes[i]);
     rtp_sender_->TimeToSendPacket(seq_num++, capture_time_ms, false);
     fake_clock_.AdvanceTimeMilliseconds(33);
   }
   // The amount of padding to send it too small to send a payload packet.
-  EXPECT_CALL(transport, SendPacket(_, kMaxPaddingSize + rtp_header_len))
-      .WillOnce(testing::ReturnArg<1>());
+  EXPECT_CALL(transport, SendRtp(_, kMaxPaddingSize + rtp_header_len))
+      .WillOnce(testing::Return(true));
   EXPECT_EQ(kMaxPaddingSize, rtp_sender_->TimeToSendPadding(49));
 
   EXPECT_CALL(transport,
-              SendPacket(_, kPayloadSizes[0] + rtp_header_len + kRtxHeaderSize))
-      .WillOnce(testing::ReturnArg<1>());
+              SendRtp(_, kPayloadSizes[0] + rtp_header_len + kRtxHeaderSize))
+      .WillOnce(testing::Return(true));
   EXPECT_EQ(kPayloadSizes[0], rtp_sender_->TimeToSendPadding(500));
 
-  EXPECT_CALL(transport, SendPacket(_, kPayloadSizes[kNumPayloadSizes - 1] +
+  EXPECT_CALL(transport, SendRtp(_, kPayloadSizes[kNumPayloadSizes - 1] +
                                            rtp_header_len + kRtxHeaderSize))
-      .WillOnce(testing::ReturnArg<1>());
-  EXPECT_CALL(transport, SendPacket(_, kMaxPaddingSize + rtp_header_len))
-      .WillOnce(testing::ReturnArg<1>());
+      .WillOnce(testing::Return(true));
+  EXPECT_CALL(transport, SendRtp(_, kMaxPaddingSize + rtp_header_len))
+      .WillOnce(testing::Return(true));
   EXPECT_EQ(kPayloadSizes[kNumPayloadSizes - 1] + kMaxPaddingSize,
             rtp_sender_->TimeToSendPadding(999));
 }