Replace scoped_ptr with unique_ptr in webrtc/api/

webrtc/api/jsepsessiondescription_unittest.cc

 /*
  *  Copyright 2012 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 <memory>
 #include <string>
 
 #include "webrtc/api/jsepicecandidate.h"
 #include "webrtc/api/jsepsessiondescription.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/helpers.h"
-#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/pc/mediasession.h"
 
 using webrtc::IceCandidateCollection;
 using webrtc::IceCandidateInterface;
 using webrtc::JsepIceCandidate;
 using webrtc::JsepSessionDescription;
 using webrtc::SessionDescriptionInterface;
-using rtc::scoped_ptr;
 
 static const char kCandidateUfrag[] = "ufrag";
 static const char kCandidatePwd[] = "pwd";
 static const char kCandidateUfragVoice[] = "ufrag_voice";
 static const char kCandidatePwdVoice[] = "pwd_voice";
 static const char kCandidateUfragVideo[] = "ufrag_video";
 static const char kCandidatePwdVideo[] = "pwd_video";
 
 // This creates a session description with both audio and video media contents.
 // In SDP this is described by two m lines, one audio and one video.
 static cricket::SessionDescription* CreateCricketSessionDescription() {
   cricket::SessionDescription* desc(new cricket::SessionDescription());
   // AudioContentDescription
-  scoped_ptr<cricket::AudioContentDescription> audio(
+  std::unique_ptr<cricket::AudioContentDescription> audio(
       new cricket::AudioContentDescription());
 
   // VideoContentDescription
-  scoped_ptr<cricket::VideoContentDescription> video(
+  std::unique_ptr<cricket::VideoContentDescription> video(
       new cricket::VideoContentDescription());
 
   audio->AddCodec(cricket::AudioCodec(103, "ISAC", 16000, 0, 0));
   desc->AddContent(cricket::CN_AUDIO, cricket::NS_JINGLE_RTP,
                    audio.release());
 
   video->AddCodec(cricket::VideoCodec(120, "VP8", 640, 480, 30));
   desc->AddContent(cricket::CN_VIDEO, cricket::NS_JINGLE_RTP,
                    video.release());
 
@@ skipping 34 matching lines @@
     return sdp;
   }
 
   SessionDescriptionInterface* DeSerialize(const std::string& sdp) {
     JsepSessionDescription* desc(new JsepSessionDescription("dummy"));
     EXPECT_TRUE(desc->Initialize(sdp, NULL));
     return desc;
   }
 
   cricket::Candidate candidate_;
-  rtc::scoped_ptr<JsepSessionDescription> jsep_desc_;
+  std::unique_ptr<JsepSessionDescription> jsep_desc_;
 };
 
 // Test that number_of_mediasections() returns the number of media contents in
 // a session description.
 TEST_F(JsepSessionDescriptionTest, CheckSessionDescription) {
   EXPECT_EQ(2u, jsep_desc_->number_of_mediasections());
 }
 
 // Test that we can add a candidate to a session description without MID.
 TEST_F(JsepSessionDescriptionTest, AddCandidateWithoutMid) {
@@ skipping 83 matching lines @@
 
   // This should also be identified as redundant and ignored.
   EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate_with_credentials));
   EXPECT_EQ(1u, jsep_desc_->candidates(0)->count());
 }
 
 // Test that we can serialize a JsepSessionDescription and deserialize it again.
 TEST_F(JsepSessionDescriptionTest, SerializeDeserialize) {
   std::string sdp = Serialize(jsep_desc_.get());
 
-  scoped_ptr<SessionDescriptionInterface> parsed_jsep_desc(DeSerialize(sdp));
+  std::unique_ptr<SessionDescriptionInterface> parsed_jsep_desc(
+      DeSerialize(sdp));
   EXPECT_EQ(2u, parsed_jsep_desc->number_of_mediasections());
 
   std::string parsed_sdp = Serialize(parsed_jsep_desc.get());
   EXPECT_EQ(sdp, parsed_sdp);
 }
 
 // Tests that we can serialize and deserialize a JsepSesssionDescription
 // with candidates.
 TEST_F(JsepSessionDescriptionTest, SerializeDeserializeWithCandidates) {
   std::string sdp = Serialize(jsep_desc_.get());
 
   // Add a candidate and check that the serialized result is different.
   JsepIceCandidate jsep_candidate("audio", 0, candidate_);
   EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate));
   std::string sdp_with_candidate = Serialize(jsep_desc_.get());
   EXPECT_NE(sdp, sdp_with_candidate);
 
-  scoped_ptr<SessionDescriptionInterface> parsed_jsep_desc(
+  std::unique_ptr<SessionDescriptionInterface> parsed_jsep_desc(
       DeSerialize(sdp_with_candidate));
   std::string parsed_sdp_with_candidate = Serialize(parsed_jsep_desc.get());
 
   EXPECT_EQ(sdp_with_candidate, parsed_sdp_with_candidate);
 }