Index: net/ssl/threaded_ssl_private_key.cc |
diff --git a/net/ssl/threaded_ssl_private_key.cc b/net/ssl/threaded_ssl_private_key.cc |
index d2f1d95ea430d6a7a097aa3f1ccc5212366fc8ab..93865add47d14608654e6839aeadeca95a85be95 100644 |
--- a/net/ssl/threaded_ssl_private_key.cc |
+++ b/net/ssl/threaded_ssl_private_key.cc |
@@ -30,7 +30,7 @@ void DoCallback(const base::WeakPtr<ThreadedSSLPrivateKey>& key, |
class ThreadedSSLPrivateKey::Core |
: public base::RefCountedThreadSafe<ThreadedSSLPrivateKey::Core> { |
public: |
- Core(scoped_ptr<ThreadedSSLPrivateKey::Delegate> delegate) |
+ Core(std::unique_ptr<ThreadedSSLPrivateKey::Delegate> delegate) |
: delegate_(std::move(delegate)) {} |
ThreadedSSLPrivateKey::Delegate* delegate() { return delegate_.get(); } |
@@ -45,11 +45,11 @@ class ThreadedSSLPrivateKey::Core |
friend class base::RefCountedThreadSafe<Core>; |
~Core() {} |
- scoped_ptr<ThreadedSSLPrivateKey::Delegate> delegate_; |
+ std::unique_ptr<ThreadedSSLPrivateKey::Delegate> delegate_; |
}; |
ThreadedSSLPrivateKey::ThreadedSSLPrivateKey( |
- scoped_ptr<ThreadedSSLPrivateKey::Delegate> delegate, |
+ std::unique_ptr<ThreadedSSLPrivateKey::Delegate> delegate, |
scoped_refptr<base::TaskRunner> task_runner) |
: core_(new Core(std::move(delegate))), |
task_runner_(std::move(task_runner)), |