Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Unified Diff: content/renderer/media/rtc_certificate_generator.cc

Issue 1461173002: Stop using rtc::scoped_ptr::Pass() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/rtc_certificate_generator.cc
diff --git a/content/renderer/media/rtc_certificate_generator.cc b/content/renderer/media/rtc_certificate_generator.cc
index 757cad0b78bc021db07b5a2d3aa56689b515d529..f7971814f47016077cb82482a62bf23d9c4a0e61 100644
--- a/content/renderer/media/rtc_certificate_generator.cc
+++ b/content/renderer/media/rtc_certificate_generator.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/rtc_certificate_generator.h"
+#include <utility>
+
#include "content/renderer/media/peer_connection_identity_store.h"
#include "content/renderer/media/rtc_certificate.h"
#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
@@ -95,15 +97,14 @@ class RTCCertificateIdentityObserver
rtc::kPemTypeRsaPrivateKey,
reinterpret_cast<const unsigned char*>(der_private_key.data()),
der_private_key.length());
- rtc::scoped_ptr<rtc::SSLIdentity> identity(
- rtc::SSLIdentity::FromPEMStrings(pem_key, pem_cert));
- OnSuccess(identity.Pass());
+ OnSuccess(rtc::scoped_ptr<rtc::SSLIdentity>(
+ rtc::SSLIdentity::FromPEMStrings(pem_key, pem_cert)));
}
void OnSuccess(rtc::scoped_ptr<rtc::SSLIdentity> identity) override {
DCHECK(signaling_thread_->BelongsToCurrentThread());
DCHECK(observer_);
rtc::scoped_refptr<rtc::RTCCertificate> certificate =
- rtc::RTCCertificate::Create(identity.Pass());
+ rtc::RTCCertificate::Create(std::move(identity));
main_thread_->PostTask(FROM_HERE, base::Bind(
&RTCCertificateIdentityObserver::DoCallbackOnMainThread,
this, new RTCCertificate(key_params_, certificate)));

Powered by Google App Engine
This is Rietveld 408576698