Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: chrome/browser/chromeos/certificate_provider/certificate_provider_service.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/certificate_provider/certificate_provider_service.h
diff --git a/chrome/browser/chromeos/certificate_provider/certificate_provider_service.h b/chrome/browser/chromeos/certificate_provider/certificate_provider_service.h
index d45794c272bf44f9e0e9bbd3d371d39119cd4430..dada1f2250e74172a72f935196dadba9d9a347ee 100644
--- a/chrome/browser/chromeos/certificate_provider/certificate_provider_service.h
+++ b/chrome/browser/chromeos/certificate_provider/certificate_provider_service.h
@@ -8,13 +8,13 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <string>
#include <vector>
#include "base/callback_forward.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "chrome/browser/chromeos/certificate_provider/certificate_info.h"
@@ -99,7 +99,7 @@ class CertificateProviderService : public KeyedService {
// called. The delegate will be destroyed in the destructor of the service and
// not before, which allows to unregister observers (e.g. for
// OnExtensionUnloaded) in the delegate's destructor on behalf of the service.
- void SetDelegate(scoped_ptr<Delegate> delegate);
+ void SetDelegate(std::unique_ptr<Delegate> delegate);
// Must be called with the reply of an extension to a previous certificate
// request. For each request, it is expected that every registered extension
@@ -143,7 +143,7 @@ class CertificateProviderService : public KeyedService {
// call its |GetCertificates()|. The returned provider is valid even after the
// destruction of this service.
// The returned provider can be used on any thread.
- scoped_ptr<CertificateProvider> CreateCertificateProvider();
+ std::unique_ptr<CertificateProvider> CreateCertificateProvider();
// Must be called if extension with id |extension_id| is unloaded and cannot
// serve certificates anymore. This should be called everytime the
@@ -185,11 +185,11 @@ class CertificateProviderService : public KeyedService {
const std::string& digest,
const net::SSLPrivateKey::SignCallback& callback);
- scoped_ptr<Delegate> delegate_;
+ std::unique_ptr<Delegate> delegate_;
// An instance of net::ClientKeyStore::CertKeyProvider that is registered at
// the net::ClientKeyStore singleton.
- scoped_ptr<CertKeyProviderImpl> cert_key_provider_;
+ std::unique_ptr<CertKeyProviderImpl> cert_key_provider_;
// State about all pending sign requests.
certificate_provider::SignRequests sign_requests_;

Powered by Google App Engine
This is Rietveld 408576698