Index: chrome/browser/chromeos/certificate_provider/certificate_provider_service.cc |
diff --git a/chrome/browser/chromeos/certificate_provider/certificate_provider_service.cc b/chrome/browser/chromeos/certificate_provider/certificate_provider_service.cc |
index e6efa8547b97ba21d1652b0277023331cb1938a2..268e426a9e052ec729aa73040e8e53782af406ad 100644 |
--- a/chrome/browser/chromeos/certificate_provider/certificate_provider_service.cc |
+++ b/chrome/browser/chromeos/certificate_provider/certificate_provider_service.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/browser/chromeos/certificate_provider/certificate_provider_service.h" |
#include <stddef.h> |
+ |
#include <utility> |
#include "base/bind.h" |
@@ -13,6 +14,7 @@ |
#include "base/location.h" |
#include "base/logging.h" |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/stl_util.h" |
#include "base/strings/string_piece.h" |
#include "base/task_runner.h" |
@@ -83,7 +85,7 @@ class CertificateProviderService::CertificateProviderImpl |
void GetCertificates(const base::Callback<void(const net::CertificateList&)>& |
callback) override; |
- scoped_ptr<CertificateProvider> Copy() override; |
+ std::unique_ptr<CertificateProvider> Copy() override; |
private: |
static void GetCertificatesOnServiceThread( |
@@ -192,9 +194,9 @@ void CertificateProviderService::CertificateProviderImpl::GetCertificates( |
callback_from_service_thread)); |
} |
-scoped_ptr<CertificateProvider> |
+std::unique_ptr<CertificateProvider> |
CertificateProviderService::CertificateProviderImpl::Copy() { |
- return make_scoped_ptr( |
+ return base::WrapUnique( |
new CertificateProviderImpl(service_task_runner_, service_)); |
} |
@@ -309,7 +311,8 @@ CertificateProviderService::~CertificateProviderService() { |
cert_key_provider_.reset(); |
} |
-void CertificateProviderService::SetDelegate(scoped_ptr<Delegate> delegate) { |
+void CertificateProviderService::SetDelegate( |
+ std::unique_ptr<Delegate> delegate) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
DCHECK(!delegate_); |
DCHECK(delegate); |
@@ -372,11 +375,11 @@ bool CertificateProviderService::LookUpCertificate( |
extension_id); |
} |
-scoped_ptr<CertificateProvider> |
+std::unique_ptr<CertificateProvider> |
CertificateProviderService::CreateCertificateProvider() { |
DCHECK(thread_checker_.CalledOnValidThread()); |
- return make_scoped_ptr(new CertificateProviderImpl( |
+ return base::WrapUnique(new CertificateProviderImpl( |
base::ThreadTaskRunnerHandle::Get(), weak_factory_.GetWeakPtr())); |
} |