Index: talk/app/webrtc/webrtcsessiondescriptionfactory.cc |
diff --git a/talk/app/webrtc/webrtcsessiondescriptionfactory.cc b/talk/app/webrtc/webrtcsessiondescriptionfactory.cc |
index 25965af79d30f92cddd20b999436d67d4a95f601..bfdbb1ac0a091ff87cf3663c93867b3c9cf95dd1 100644 |
--- a/talk/app/webrtc/webrtcsessiondescriptionfactory.cc |
+++ b/talk/app/webrtc/webrtcsessiondescriptionfactory.cc |
@@ -27,6 +27,8 @@ |
#include "talk/app/webrtc/webrtcsessiondescriptionfactory.h" |
+#include <utility> |
+ |
#include "talk/app/webrtc/dtlsidentitystore.h" |
#include "talk/app/webrtc/jsep.h" |
#include "talk/app/webrtc/jsepsessiondescription.h" |
@@ -99,12 +101,12 @@ void WebRtcIdentityRequestObserver::OnSuccess( |
der_private_key.length()); |
rtc::scoped_ptr<rtc::SSLIdentity> identity( |
rtc::SSLIdentity::FromPEMStrings(pem_key, pem_cert)); |
- SignalCertificateReady(rtc::RTCCertificate::Create(identity.Pass())); |
+ SignalCertificateReady(rtc::RTCCertificate::Create(std::move(identity))); |
} |
void WebRtcIdentityRequestObserver::OnSuccess( |
rtc::scoped_ptr<rtc::SSLIdentity> identity) { |
- SignalCertificateReady(rtc::RTCCertificate::Create(identity.Pass())); |
+ SignalCertificateReady(rtc::RTCCertificate::Create(std::move(identity))); |
} |
// static |
@@ -143,7 +145,7 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory( |
// to just use a random number as session id and start version from |
// |kInitSessionVersion|. |
session_version_(kInitSessionVersion), |
- dtls_identity_store_(dtls_identity_store.Pass()), |
+ dtls_identity_store_(std::move(dtls_identity_store)), |
identity_request_observer_(identity_request_observer), |
session_(session), |
session_id_(session_id), |
@@ -177,7 +179,7 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory( |
: WebRtcSessionDescriptionFactory( |
signaling_thread, |
channel_manager, |
- dtls_identity_store.Pass(), |
+ std::move(dtls_identity_store), |
new rtc::RefCountedObject<WebRtcIdentityRequestObserver>(), |
session, |
session_id, |