Remove webrtc/base/scoped_ptr.h

webrtc/api/peerconnectioninterface_unittest.cc

Index: webrtc/api/peerconnectioninterface_unittest.cc
diff --git a/webrtc/api/peerconnectioninterface_unittest.cc b/webrtc/api/peerconnectioninterface_unittest.cc
index 68c932b5aae1bacf9380a2613e114ee8e8f1c62c..d33a40289656d86d570838782a78a93350ef3069 100644
--- a/webrtc/api/peerconnectioninterface_unittest.cc
+++ b/webrtc/api/peerconnectioninterface_unittest.cc
@@ -962,20 +962,20 @@ class PeerConnectionInterfaceTest : public testing::Test {
     ASSERT_TRUE(stream->AddTrack(video_track));
   }
 
-  rtc::scoped_ptr<SessionDescriptionInterface> CreateOfferWithOneAudioStream() {
+  std::unique_ptr<SessionDescriptionInterface> CreateOfferWithOneAudioStream() {
     CreatePeerConnection();
     AddVoiceStream(kStreamLabel1);
-    rtc::scoped_ptr<SessionDescriptionInterface> offer;
+    std::unique_ptr<SessionDescriptionInterface> offer;
     EXPECT_TRUE(DoCreateOffer(&offer, nullptr));
     return offer;
   }
 
-  rtc::scoped_ptr<SessionDescriptionInterface>
+  std::unique_ptr<SessionDescriptionInterface>
   CreateAnswerWithOneAudioStream() {
-    rtc::scoped_ptr<SessionDescriptionInterface> offer =
+    std::unique_ptr<SessionDescriptionInterface> offer =
         CreateOfferWithOneAudioStream();
     EXPECT_TRUE(DoSetRemoteDescription(offer.release()));
-    rtc::scoped_ptr<SessionDescriptionInterface> answer;
+    std::unique_ptr<SessionDescriptionInterface> answer;
     EXPECT_TRUE(DoCreateAnswer(&answer, nullptr));
     return answer;
   }
@@ -1001,18 +1001,18 @@ class PeerConnectionInterfaceTest : public testing::Test {
 // The CNAMEs are expected to be generated randomly. It is possible
 // that the test fails, though the possibility is very low.
 TEST_F(PeerConnectionInterfaceTest, CnameGenerationInOffer) {
-  rtc::scoped_ptr<SessionDescriptionInterface> offer1 =
+  std::unique_ptr<SessionDescriptionInterface> offer1 =
       CreateOfferWithOneAudioStream();
-  rtc::scoped_ptr<SessionDescriptionInterface> offer2 =
+  std::unique_ptr<SessionDescriptionInterface> offer2 =
       CreateOfferWithOneAudioStream();
   EXPECT_NE(GetFirstAudioStreamCname(offer1.get()),
             GetFirstAudioStreamCname(offer2.get()));
 }
 
 TEST_F(PeerConnectionInterfaceTest, CnameGenerationInAnswer) {
-  rtc::scoped_ptr<SessionDescriptionInterface> answer1 =
+  std::unique_ptr<SessionDescriptionInterface> answer1 =
       CreateAnswerWithOneAudioStream();
-  rtc::scoped_ptr<SessionDescriptionInterface> answer2 =
+  std::unique_ptr<SessionDescriptionInterface> answer2 =
       CreateAnswerWithOneAudioStream();
   EXPECT_NE(GetFirstAudioStreamCname(answer1.get()),
             GetFirstAudioStreamCname(answer2.get()));