zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove webrtc/base/scoped_ptr.h

Browse Source 
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}
This commit is contained in:
kwiberg
2016-05-14 19:44:11 -07:00
committed by Commit bot
parent c06b133b29
commit fd8be3468a
77 changed files with 33 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webrtc/api/peerconnectioninterface_unittest.cc
View File

@ -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()));