| Index: components/password_manager/content/browser/credential_manager_dispatcher.h
|
| diff --git a/components/password_manager/content/browser/credential_manager_dispatcher.h b/components/password_manager/content/browser/credential_manager_dispatcher.h
|
| index 9e9f87ae8e227dd799c84d5457d025b8b13c4ce2..1471a7b767e7d7a2cbff2f28ca9912433a30244a 100644
|
| --- a/components/password_manager/content/browser/credential_manager_dispatcher.h
|
| +++ b/components/password_manager/content/browser/credential_manager_dispatcher.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef COMPONENTS_PASSWORD_MANAGER_CONTENT_BROWSER_CONTENT_CREDENTIAL_MANAGER_DISPATCHER_H_
|
| #define COMPONENTS_PASSWORD_MANAGER_CONTENT_BROWSER_CONTENT_CREDENTIAL_MANAGER_DISPATCHER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "components/password_manager/core/browser/credential_manager_password_form_manager.h"
|
| #include "components/password_manager/core/browser/credential_manager_pending_request_task.h"
|
| @@ -105,7 +106,7 @@ class CredentialManagerDispatcher
|
| bool IsUpdatingCredentialAllowed() const;
|
|
|
| PasswordManagerClient* client_;
|
| - scoped_ptr<CredentialManagerPasswordFormManager> form_manager_;
|
| + std::unique_ptr<CredentialManagerPasswordFormManager> form_manager_;
|
|
|
| // Set to false to disable automatic signing in.
|
| BooleanPrefMember auto_signin_enabled_;
|
| @@ -114,8 +115,8 @@ class CredentialManagerDispatcher
|
| // PasswordStore; we push enough data into Pending*Task objects so that
|
| // they can properly respond to the request once the PasswordStore gives
|
| // us data.
|
| - scoped_ptr<CredentialManagerPendingRequestTask> pending_request_;
|
| - scoped_ptr<CredentialManagerPendingRequireUserMediationTask>
|
| + std::unique_ptr<CredentialManagerPendingRequestTask> pending_request_;
|
| + std::unique_ptr<CredentialManagerPendingRequireUserMediationTask>
|
| pending_require_user_mediation_;
|
|
|
| base::WeakPtrFactory<CredentialManagerDispatcher> weak_factory_;
|
|
|