commit 795883204b635fe617c578499f10dd3d6416570a
author kwiberg <kwiberg@webrtc.org> Thu Mar 17 16:17:43 2016
committer Commit bot <commit-bot@chromium.org> Thu Mar 17 16:17:49 2016
tree d8118899ea48084ac937501bb1026b357e1b5e9e
parent 2487f18a1333bf4589caa9734c75cf9b8f5771ea

Replace scoped_ptr with unique_ptr in webrtc/modules/

Except in places where this would break out-of-tree code,
such as Chromium.

BUG=webrtc:5520

Review URL: https://codereview.webrtc.org/1785173002

Cr-Original-Commit-Position: refs/heads/master@{#12037}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 22feaa3d15881c659d8fe1b49441649c0396d6a1

modules/pacing/packet_router_unittest.cc

diff --git a/modules/pacing/packet_router_unittest.cc b/modules/pacing/packet_router_unittest.cc
index 4649358..faf270c 100644
--- a/modules/pacing/packet_router_unittest.cc
+++ b/modules/pacing/packet_router_unittest.cc
@@ -9,6 +9,7 @@
  */
 
 #include <list>
+#include <memory>
 
 #include "webrtc/base/checks.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -17,7 +18,6 @@
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
-#include "webrtc/base/scoped_ptr.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
@@ -30,7 +30,7 @@
  public:
   PacketRouterTest() : packet_router_(new PacketRouter()) {}
  protected:
-  const rtc::scoped_ptr<PacketRouter> packet_router_;
+  const std::unique_ptr<PacketRouter> packet_router_;
 };
 
 TEST_F(PacketRouterTest, TimeToSendPacket) {