commit fd8be3468a2edf4ff1d2b064fcc388464f2c10d1
author kwiberg <kwiberg@webrtc.org> Sat May 14 19:44:11 2016 -0700
committer Commit bot <commit-bot@chromium.org> Sun May 15 02:44:18 2016 +0000
tree 33868b351241b5f757c4df636226f6205131ff54
parent c06b133b2907ea67f2c1f23488a51e0de643e9ef

Remove webrtc/base/scoped_ptr.h

This is a re-land of https://codereview.webrtc.org/1942823002

TBR=tommi@webrtc.org
BUG=webrtc:5520

Review-Url: https://codereview.webrtc.org/1966423002
Cr-Commit-Position: refs/heads/master@{#12750}

webrtc/api/peerconnectioninterface_unittest.cc

diff --git a/webrtc/api/peerconnectioninterface_unittest.cc b/webrtc/api/peerconnectioninterface_unittest.cc
index 68c932b..d33a402 100644
--- a/webrtc/api/peerconnectioninterface_unittest.cc
+++ b/webrtc/api/peerconnectioninterface_unittest.cc
@@ -962,20 +962,20 @@
     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 @@
 // 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()));