Index: components/password_manager/core/browser/password_manager.cc |
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc |
index 60cdeb6d1ffaf484cc445995fe04f7d6864e3add..f734ef0010b49b527f7f87b5d5222a4e5044c519 100644 |
--- a/components/password_manager/core/browser/password_manager.cc |
+++ b/components/password_manager/core/browser/password_manager.cc |
@@ -222,7 +222,7 @@ void PasswordManager::ProvisionallySavePassword(const PasswordForm& form) { |
bool is_saving_and_filling_enabled = |
client_->IsSavingAndFillingEnabledForCurrentPage(); |
- scoped_ptr<BrowserSavePasswordProgressLogger> logger; |
+ std::unique_ptr<BrowserSavePasswordProgressLogger> logger; |
if (password_manager_util::IsLoggingActive(client_)) { |
logger.reset( |
new BrowserSavePasswordProgressLogger(client_->GetLogManager())); |
@@ -242,7 +242,7 @@ void PasswordManager::ProvisionallySavePassword(const PasswordForm& form) { |
return; |
} |
- scoped_ptr<PasswordFormManager> manager; |
+ std::unique_ptr<PasswordFormManager> manager; |
ScopedVector<PasswordFormManager>::iterator matched_manager_it = |
pending_login_managers_.end(); |
PasswordFormManager::MatchResultMask current_match_result = |
@@ -441,7 +441,7 @@ void PasswordManager::OnPasswordFormsParsed( |
void PasswordManager::CreatePendingLoginManagers( |
password_manager::PasswordManagerDriver* driver, |
const std::vector<PasswordForm>& forms) { |
- scoped_ptr<BrowserSavePasswordProgressLogger> logger; |
+ std::unique_ptr<BrowserSavePasswordProgressLogger> logger; |
if (password_manager_util::IsLoggingActive(client_)) { |
logger.reset( |
new BrowserSavePasswordProgressLogger(client_->GetLogManager())); |
@@ -512,7 +512,7 @@ void PasswordManager::CreatePendingLoginManagers( |
} |
bool PasswordManager::CanProvisionalManagerSave() { |
- scoped_ptr<BrowserSavePasswordProgressLogger> logger; |
+ std::unique_ptr<BrowserSavePasswordProgressLogger> logger; |
if (password_manager_util::IsLoggingActive(client_)) { |
logger.reset( |
new BrowserSavePasswordProgressLogger(client_->GetLogManager())); |
@@ -555,7 +555,7 @@ void PasswordManager::OnPasswordFormsRendered( |
const std::vector<PasswordForm>& visible_forms, |
bool did_stop_loading) { |
CreatePendingLoginManagers(driver, visible_forms); |
- scoped_ptr<BrowserSavePasswordProgressLogger> logger; |
+ std::unique_ptr<BrowserSavePasswordProgressLogger> logger; |
if (password_manager_util::IsLoggingActive(client_)) { |
logger.reset( |
new BrowserSavePasswordProgressLogger(client_->GetLogManager())); |
@@ -633,7 +633,7 @@ void PasswordManager::OnPasswordFormsRendered( |
void PasswordManager::OnInPageNavigation( |
password_manager::PasswordManagerDriver* driver, |
const PasswordForm& password_form) { |
- scoped_ptr<BrowserSavePasswordProgressLogger> logger; |
+ std::unique_ptr<BrowserSavePasswordProgressLogger> logger; |
if (password_manager_util::IsLoggingActive(client_)) { |
logger.reset( |
new BrowserSavePasswordProgressLogger(client_->GetLogManager())); |
@@ -649,7 +649,7 @@ void PasswordManager::OnInPageNavigation( |
} |
void PasswordManager::OnLoginSuccessful() { |
- scoped_ptr<BrowserSavePasswordProgressLogger> logger; |
+ std::unique_ptr<BrowserSavePasswordProgressLogger> logger; |
if (password_manager_util::IsLoggingActive(client_)) { |
logger.reset( |
new BrowserSavePasswordProgressLogger(client_->GetLogManager())); |
@@ -717,12 +717,12 @@ void PasswordManager::Autofill( |
password_manager::PasswordManagerDriver* driver, |
const PasswordForm& form_for_autofill, |
const PasswordFormMap& best_matches, |
- const std::vector<scoped_ptr<PasswordForm>>& federated_matches, |
+ const std::vector<std::unique_ptr<PasswordForm>>& federated_matches, |
const PasswordForm& preferred_match, |
bool wait_for_username) const { |
DCHECK_EQ(PasswordForm::SCHEME_HTML, preferred_match.scheme); |
- scoped_ptr<BrowserSavePasswordProgressLogger> logger; |
+ std::unique_ptr<BrowserSavePasswordProgressLogger> logger; |
if (password_manager_util::IsLoggingActive(client_)) { |
logger.reset( |
new BrowserSavePasswordProgressLogger(client_->GetLogManager())); |
@@ -751,7 +751,7 @@ void PasswordManager::AutofillHttpAuth( |
const PasswordForm& preferred_match) const { |
DCHECK_NE(PasswordForm::SCHEME_HTML, preferred_match.scheme); |
- scoped_ptr<BrowserSavePasswordProgressLogger> logger; |
+ std::unique_ptr<BrowserSavePasswordProgressLogger> logger; |
if (password_manager_util::IsLoggingActive(client_)) { |
logger.reset( |
new BrowserSavePasswordProgressLogger(client_->GetLogManager())); |