| 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 {
|
|
|