Replace scoped_ptr with unique_ptr in webrtc/base/

webrtc/api/dtlsidentitystore.h

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_API_DTLSIDENTITYSTORE_H_
 #define WEBRTC_API_DTLSIDENTITYSTORE_H_
 
+#include <memory>
 #include <queue>
 #include <string>
 #include <utility>
 
 #include "webrtc/base/messagehandler.h"
 #include "webrtc/base/messagequeue.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/sslidentity.h"
 #include "webrtc/base/thread.h"
 
 namespace webrtc {
 
 // Passed to SSLIdentity::Generate.
 extern const char kIdentityName[];
 
 class SSLIdentity;
 class Thread;
 
 // Used to receive callbacks of DTLS identity requests.
 class DtlsIdentityRequestObserver : public rtc::RefCountInterface {
  public:
   virtual void OnFailure(int error) = 0;
   // TODO(hbos): Unify the OnSuccess method once Chrome code is updated.
   virtual void OnSuccess(const std::string& der_cert,
                          const std::string& der_private_key) = 0;
-  // |identity| is a scoped_ptr because rtc::SSLIdentity is not copyable and the
+  // |identity| is a unique_ptr because rtc::SSLIdentity is not copyable and the
   // client has to get the ownership of the object to make use of it.
-  virtual void OnSuccess(rtc::scoped_ptr<rtc::SSLIdentity> identity) = 0;
+  virtual void OnSuccess(std::unique_ptr<rtc::SSLIdentity> identity) = 0;
 
  protected:
   virtual ~DtlsIdentityRequestObserver() {}
 };
 
 // This interface defines an in-memory DTLS identity store, which generates DTLS
 // identities.
 // APIs calls must be made on the signaling thread and the callbacks are also
 // called on the signaling thread.
 class DtlsIdentityStoreInterface {
@@ skipping 44 matching lines @@
   void OnMessage(rtc::Message* msg) override;
 
   // Returns true if there is a free RSA identity, used for unit tests.
   bool HasFreeIdentityForTesting(rtc::KeyType key_type) const;
 
  private:
   void GenerateIdentity(
       rtc::KeyType key_type,
       const rtc::scoped_refptr<DtlsIdentityRequestObserver>& observer);
   void OnIdentityGenerated(rtc::KeyType key_type,
-                           rtc::scoped_ptr<rtc::SSLIdentity> identity);
+                           std::unique_ptr<rtc::SSLIdentity> identity);
 
   class WorkerTask;
   typedef rtc::ScopedMessageData<DtlsIdentityStoreImpl::WorkerTask>
       WorkerTaskMessageData;
 
   // A key type-identity pair.
   struct IdentityResult {
     IdentityResult(rtc::KeyType key_type,
-                   rtc::scoped_ptr<rtc::SSLIdentity> identity)
+                   std::unique_ptr<rtc::SSLIdentity> identity)
         : key_type_(key_type), identity_(std::move(identity)) {}
 
     rtc::KeyType key_type_;
-    rtc::scoped_ptr<rtc::SSLIdentity> identity_;
+    std::unique_ptr<rtc::SSLIdentity> identity_;
   };
 
   typedef rtc::ScopedMessageData<IdentityResult> IdentityResultMessageData;
 
   sigslot::signal0<> SignalDestroyed;
 
   rtc::Thread* const signaling_thread_;
   // TODO(hbos): RSA generation is slow and would be VERY slow if we switch over
   // to 2048, DtlsIdentityStore should use a new thread and not the "general
   // purpose" worker thread.
   rtc::Thread* const worker_thread_;
 
   struct RequestInfo {
     RequestInfo()
         : request_observers_(), gen_in_progress_counts_(0), free_identity_() {}
 
     std::queue<rtc::scoped_refptr<DtlsIdentityRequestObserver>>
         request_observers_;
     size_t gen_in_progress_counts_;
-    rtc::scoped_ptr<rtc::SSLIdentity> free_identity_;
+    std::unique_ptr<rtc::SSLIdentity> free_identity_;
   };
 
   // One RequestInfo per KeyType. Only touch on the |signaling_thread_|.
   RequestInfo request_info_[rtc::KT_LAST];
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_DTLSIDENTITYSTORE_H_