Replace scoped_ptr with unique_ptr in webrtc/modules/remote_bitrate_estimator/

webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <limits>
+#include <memory>
 #include <vector>
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h"
 #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 using ::testing::_;
 using ::testing::Invoke;
 
@@ skipping 71 matching lines @@
   void OnSentPacket(PacketInfo info) {
     info.arrival_time_ms = 0;
     adapter_->AddPacket(info.sequence_number, info.payload_size,
                         info.was_paced);
     adapter_->OnSentPacket(info.sequence_number, info.send_time_ms);
   }
 
   SimulatedClock clock_;
   MockRemoteBitrateEstimator* bitrate_estimator_;
   MockBitrateControllerAdapter bitrate_controller_;
-  rtc::scoped_ptr<TransportFeedbackAdapter> adapter_;
+  std::unique_ptr<TransportFeedbackAdapter> adapter_;
 
   uint32_t receiver_estimated_bitrate_;
 };
 
 TEST_F(TransportFeedbackAdapterTest, AdaptsFeedbackAndPopulatesSendTimes) {
   std::vector<PacketInfo> packets;
   packets.push_back(PacketInfo(100, 200, 0, 1500, true));
   packets.push_back(PacketInfo(110, 210, 1, 1500, true));
   packets.push_back(PacketInfo(120, 220, 2, 1500, true));
   packets.push_back(PacketInfo(130, 230, 3, 1500, true));
@@ skipping 70 matching lines @@
                                static_cast<int64_t>((1 << 23) - 1) / 1000;
   std::vector<PacketInfo> packets;
   packets.push_back(PacketInfo(kHighArrivalTimeMs - 64, 200, 0, 1500, true));
   packets.push_back(PacketInfo(kHighArrivalTimeMs + 64, 210, 1, 1500, true));
   packets.push_back(PacketInfo(kHighArrivalTimeMs, 220, 2, 1500, true));
 
   for (const PacketInfo& packet : packets)
     OnSentPacket(packet);
 
   for (size_t i = 0; i < packets.size(); ++i) {
-    rtc::scoped_ptr<rtcp::TransportFeedback> feedback(
+    std::unique_ptr<rtcp::TransportFeedback> feedback(
         new rtcp::TransportFeedback());
     feedback->WithBase(packets[i].sequence_number,
                        packets[i].arrival_time_ms * 1000);
 
     EXPECT_TRUE(feedback->WithReceivedPacket(
         packets[i].sequence_number, packets[i].arrival_time_ms * 1000));
 
     rtc::Buffer raw_packet = feedback->Build();
-    feedback = rtcp::TransportFeedback::ParseFrom(raw_packet.data(),
-                                                  raw_packet.size());
+    feedback = rtc::ScopedToUnique(rtcp::TransportFeedback::ParseFrom(
+        raw_packet.data(), raw_packet.size()));
 
     std::vector<PacketInfo> expected_packets;
     expected_packets.push_back(packets[i]);
 
     EXPECT_CALL(*bitrate_estimator_, IncomingPacketFeedbackVector(_))
         .Times(1)
         .WillOnce(Invoke([expected_packets, this](
             const std::vector<PacketInfo>& feedback_vector) {
           ComparePacketVectors(expected_packets, feedback_vector);
         }));
@@ skipping 34 matching lines @@
   info.send_time_ms += (kLargePositiveDeltaUs + 1000) / 1000;
   info.arrival_time_ms += (kLargePositiveDeltaUs + 1000) / 1000;
   ++info.sequence_number;
 
   // Packets will be added to send history.
   for (const PacketInfo& packet : sent_packets)
     OnSentPacket(packet);
   OnSentPacket(info);
 
   // Create expected feedback and send into adapter.
-  rtc::scoped_ptr<rtcp::TransportFeedback> feedback(
+  std::unique_ptr<rtcp::TransportFeedback> feedback(
       new rtcp::TransportFeedback());
   feedback->WithBase(sent_packets[0].sequence_number,
                      sent_packets[0].arrival_time_ms * 1000);
 
   for (const PacketInfo& packet : sent_packets) {
     EXPECT_TRUE(feedback->WithReceivedPacket(packet.sequence_number,
                                              packet.arrival_time_ms * 1000));
   }
   EXPECT_FALSE(feedback->WithReceivedPacket(info.sequence_number,
                                             info.arrival_time_ms * 1000));
 
   rtc::Buffer raw_packet = feedback->Build();
-  feedback = rtcp::TransportFeedback::ParseFrom(raw_packet.data(),
-                                                raw_packet.size());
+  feedback = rtc::ScopedToUnique(
+      rtcp::TransportFeedback::ParseFrom(raw_packet.data(), raw_packet.size()));
 
   std::vector<PacketInfo> received_feedback;
 
   EXPECT_TRUE(feedback.get() != nullptr);
   EXPECT_CALL(*bitrate_estimator_, IncomingPacketFeedbackVector(_))
       .Times(1)
       .WillOnce(Invoke([sent_packets, &received_feedback](
           const std::vector<PacketInfo>& feedback_vector) {
         EXPECT_EQ(sent_packets.size(), feedback_vector.size());
         received_feedback = feedback_vector;
       }));
   adapter_->OnTransportFeedback(*feedback.get());
 
   // Create a new feedback message and add the trailing item.
   feedback.reset(new rtcp::TransportFeedback());
   feedback->WithBase(info.sequence_number, info.arrival_time_ms * 1000);
   EXPECT_TRUE(feedback->WithReceivedPacket(info.sequence_number,
                                            info.arrival_time_ms * 1000));
   raw_packet = feedback->Build();
-  feedback = rtcp::TransportFeedback::ParseFrom(raw_packet.data(),
-                                                raw_packet.size());
+  feedback = rtc::ScopedToUnique(
+      rtcp::TransportFeedback::ParseFrom(raw_packet.data(), raw_packet.size()));
 
   EXPECT_TRUE(feedback.get() != nullptr);
   EXPECT_CALL(*bitrate_estimator_, IncomingPacketFeedbackVector(_))
       .Times(1)
       .WillOnce(Invoke(
           [&received_feedback](const std::vector<PacketInfo>& feedback_vector) {
             EXPECT_EQ(1u, feedback_vector.size());
             received_feedback.push_back(feedback_vector[0]);
           }));
   adapter_->OnTransportFeedback(*feedback.get());
 
   sent_packets.push_back(info);
 
   ComparePacketVectors(sent_packets, received_feedback);
 }
 
 }  // namespace test
 }  // namespace webrtc