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

Unified Diff: chrome/browser/password_manager/password_manager_util_win.cc

Issue 1858513002: chrome/browser/password_manager: scoped_ptr -> unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Windows -- revert unwanted change 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/password_manager/password_manager_util_win.cc
diff --git a/chrome/browser/password_manager/password_manager_util_win.cc b/chrome/browser/password_manager/password_manager_util_win.cc
index 5e675cac895467a1d7407097f0c7cc92cf8c7027..4fe6cca3ff2392920ef4c70cc050221065106079 100644
--- a/chrome/browser/password_manager/password_manager_util_win.cc
+++ b/chrome/browser/password_manager/password_manager_util_win.cc
@@ -9,6 +9,8 @@
#include <stdint.h>
#include <wincred.h>
+#include <memory>
+
// SECURITY_WIN32 must be defined in order to get
// EXTENDED_NAME_FORMAT enumeration.
#define SECURITY_WIN32 1
@@ -19,7 +21,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/worker_pool.h"
@@ -188,8 +189,8 @@ void GetOsPasswordStatusInternal(PasswordCheckPrefs* prefs,
}
}
-void ReplyOsPasswordStatus(scoped_ptr<PasswordCheckPrefs> prefs,
- scoped_ptr<OsPasswordStatus> status) {
+void ReplyOsPasswordStatus(std::unique_ptr<PasswordCheckPrefs> prefs,
+ std::unique_ptr<OsPasswordStatus> status) {
PrefService* local_state = g_browser_process->local_state();
prefs->Write(local_state);
UMA_HISTOGRAM_ENUMERATION("PasswordManager.OsPasswordStatus", *status,
@@ -200,9 +201,9 @@ void GetOsPasswordStatus() {
// Preferences can be accessed on the UI thread only.
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
PrefService* local_state = g_browser_process->local_state();
- scoped_ptr<PasswordCheckPrefs> prefs(new PasswordCheckPrefs);
+ std::unique_ptr<PasswordCheckPrefs> prefs(new PasswordCheckPrefs);
prefs->Read(local_state);
- scoped_ptr<OsPasswordStatus> status(
+ std::unique_ptr<OsPasswordStatus> status(
new OsPasswordStatus(PASSWORD_STATUS_UNKNOWN));
PasswordCheckPrefs* prefs_weak = prefs.get();
OsPasswordStatus* status_weak = status.get();

Powered by Google App Engine
This is Rietveld 408576698