| Index: chrome/browser/ui/passwords/manage_passwords_state.h
|
| diff --git a/chrome/browser/ui/passwords/manage_passwords_state.h b/chrome/browser/ui/passwords/manage_passwords_state.h
|
| index f4cf5e4bb37fc5ca5083404ecf504657074e3702..1f61af3fda6a9e0fe1de309c7c2b80bfcf1980ae 100644
|
| --- a/chrome/browser/ui/passwords/manage_passwords_state.h
|
| +++ b/chrome/browser/ui/passwords/manage_passwords_state.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_STATE_H_
|
| #define CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_STATE_H_
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "components/autofill/core/common/password_form.h"
|
| #include "components/password_manager/core/browser/password_store_change.h"
|
| @@ -43,11 +43,11 @@ class ManagePasswordsState {
|
|
|
| // Move to PENDING_PASSWORD_STATE.
|
| void OnPendingPassword(
|
| - scoped_ptr<password_manager::PasswordFormManager> form_manager);
|
| + std::unique_ptr<password_manager::PasswordFormManager> form_manager);
|
|
|
| // Move to PENDING_PASSWORD_UPDATE_STATE.
|
| void OnUpdatePassword(
|
| - scoped_ptr<password_manager::PasswordFormManager> form_manager);
|
| + std::unique_ptr<password_manager::PasswordFormManager> form_manager);
|
|
|
| // Move to CREDENTIAL_REQUEST_STATE.
|
| void OnRequestCredentials(
|
| @@ -61,7 +61,7 @@ class ManagePasswordsState {
|
|
|
| // Move to CONFIRMATION_STATE.
|
| void OnAutomaticPasswordSave(
|
| - scoped_ptr<password_manager::PasswordFormManager> form_manager);
|
| + std::unique_ptr<password_manager::PasswordFormManager> form_manager);
|
|
|
| // Move to MANAGE_STATE or INACTIVE_STATE for PSL matched passwords.
|
| // |password_form_map| contains best matches from the password store for the
|
| @@ -71,7 +71,8 @@ class ManagePasswordsState {
|
| void OnPasswordAutofilled(
|
| const autofill::PasswordFormMap& password_form_map,
|
| const GURL& origin,
|
| - const std::vector<scoped_ptr<autofill::PasswordForm>>* federated_matches);
|
| + const std::vector<std::unique_ptr<autofill::PasswordForm>>*
|
| + federated_matches);
|
|
|
| // Move to INACTIVE_STATE.
|
| void OnInactive();
|
| @@ -130,7 +131,7 @@ class ManagePasswordsState {
|
| GURL origin_;
|
|
|
| // Contains the password that was submitted.
|
| - scoped_ptr<password_manager::PasswordFormManager> form_manager_;
|
| + std::unique_ptr<password_manager::PasswordFormManager> form_manager_;
|
|
|
| // Weak references to the passwords for the current status. The hard pointers
|
| // are scattered between |form_manager_| and |local_credentials_forms_|. If
|
|
|