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

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

Issue 1946553002: WebRTC's scoped_ptr and scoped_ptr.h are going away, so stop using them (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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
« no previous file with comments | « no previous file | content/renderer/media/rtc_certificate_generator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/peer_connection_identity_store.cc
diff --git a/content/renderer/media/peer_connection_identity_store.cc b/content/renderer/media/peer_connection_identity_store.cc
index 89b057997eb062adb1201a0ffb1a7c762b6536a3..89d91de4944aaaa69709007bd9956b5caa779548 100644
--- a/content/renderer/media/peer_connection_identity_store.cc
+++ b/content/renderer/media/peer_connection_identity_store.cc
@@ -94,7 +94,7 @@ class RequestHandler : public base::RefCountedThreadSafe<RequestHandler> {
void ObserverOnSuccess(
const rtc::scoped_refptr<webrtc::DtlsIdentityRequestObserver>& observer,
std::unique_ptr<rtc::SSLIdentity> identity) {
- observer->OnSuccess(rtc::scoped_ptr<rtc::SSLIdentity>(identity.release()));
+ observer->OnSuccess(std::move(identity));
}
} // namespace
@@ -164,9 +164,6 @@ void PeerConnectionIdentityStore::RequestIdentity(
// DtlsIdentityStoreInterface implementations have to be async.
if (identity) {
// Async call to |observer|->OnSuccess.
- // Helper function necessary because OnSuccess takes an rtc::scoped_ptr
- // argument which has to be Pass()-ed. base::Passed gets around this for
- // scoped_ptr (without rtc namespace), but not for rtc::scoped_ptr.
signaling_thread_->PostTask(FROM_HERE,
base::Bind(&ObserverOnSuccess, observer, base::Passed(&identity)));
} else {
« no previous file with comments | « no previous file | content/renderer/media/rtc_certificate_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698