Index: chrome/browser/ui/webui/options/certificate_manager_handler.h |
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.h b/chrome/browser/ui/webui/options/certificate_manager_handler.h |
index a5e9bc7bf6d239cda5e15abf95f52886a1c5037d..ce0cc110834f6dc1ba3b2404ccc4e1096a3d6cef 100644 |
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.h |
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.h |
@@ -5,11 +5,11 @@ |
#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_ |
#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CERTIFICATE_MANAGER_HANDLER_H_ |
+#include <memory> |
#include <string> |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/task/cancelable_task_tracker.h" |
#include "chrome/browser/certificate_manager_model.h" |
@@ -132,7 +132,7 @@ class CertificateManagerHandler |
// Model initialization methods. |
void OnCertificateManagerModelCreated( |
- scoped_ptr<CertificateManagerModel> model); |
+ std::unique_ptr<CertificateManagerModel> model); |
void CertificateManagerModelReady(); |
// Populate the trees in all the tabs. |
@@ -165,7 +165,7 @@ class CertificateManagerHandler |
bool show_certs_in_modal_dialog_; |
// The Certificates Manager model |
bool requested_certificate_manager_model_; |
- scoped_ptr<CertificateManagerModel> certificate_manager_model_; |
+ std::unique_ptr<CertificateManagerModel> certificate_manager_model_; |
// For multi-step import or export processes, we need to store the path, |
// password, etc the user chose while we wait for them to enter a password, |
@@ -182,7 +182,7 @@ class CertificateManagerHandler |
base::CancelableTaskTracker tracker_; |
scoped_refptr<FileAccessProvider> file_access_provider_; |
- scoped_ptr<CertIdMap> cert_id_map_; |
+ std::unique_ptr<CertIdMap> cert_id_map_; |
base::WeakPtrFactory<CertificateManagerHandler> weak_ptr_factory_; |