WebRTC's scoped_ptr and scoped_ptr.h are going away, so stop using them

content/renderer/media/peer_connection_identity_store.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/peer_connection_identity_store.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 76 matching lines @@
   const scoped_refptr<base::SingleThreadTaskRunner> main_thread_;
   const scoped_refptr<base::SingleThreadTaskRunner> signaling_thread_;
   scoped_refptr<webrtc::DtlsIdentityRequestObserver> observer_;
 };
 
 // Helper function for PeerConnectionIdentityStore::RequestIdentity.
 // Used to invoke |observer|->OnSuccess in a PostTask.
 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
 
 PeerConnectionIdentityStore::PeerConnectionIdentityStore(
     const scoped_refptr<base::SingleThreadTaskRunner>& main_thread,
     const scoped_refptr<base::SingleThreadTaskRunner>& signaling_thread,
     const GURL& url,
     const GURL& first_party_for_cookies)
     : main_thread_(main_thread),
@@ skipping 49 matching lines @@
       // to use |time_t| and stop using |time_t| here, its type is unspecified
       // and shouldn't be used if we have a choice. bugs.webrtc.org/5720.
       identity.reset(rtc::SSLIdentity::GenerateWithExpiration(
           kIdentityName, key_params, static_cast<time_t>(expires_s)));
     }
 
     // Invoke |observer| callbacks asynchronously. The callbacks of
     // 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 {
       // Async call to |observer|->OnFailure.
       signaling_thread_->PostTask(FROM_HERE,
           base::Bind(&webrtc::DtlsIdentityRequestObserver::OnFailure,
                      observer, 0));
     }
   }
 }
 
 }  // namespace content