| Index: components/password_manager/core/browser/password_manager_util.cc
|
| diff --git a/components/password_manager/core/browser/password_manager_util.cc b/components/password_manager/core/browser/password_manager_util.cc
|
| index ef12ebe0d7b2bf5c8c7243b106675d350ae6f218..e8804193affa8cada299ff407b9b7ba30a2294f4 100644
|
| --- a/components/password_manager/core/browser/password_manager_util.cc
|
| +++ b/components/password_manager/core/browser/password_manager_util.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <algorithm>
|
|
|
| +#include "base/memory/ptr_util.h"
|
| #include "components/autofill/core/common/password_form.h"
|
| #include "components/password_manager/core/browser/log_manager.h"
|
| #include "components/sync_driver/sync_service.h"
|
| @@ -75,12 +76,12 @@ void TrimUsernameOnlyCredentials(
|
| android_credentials->swap(result);
|
| }
|
|
|
| -std::vector<scoped_ptr<autofill::PasswordForm>> ConvertScopedVector(
|
| +std::vector<std::unique_ptr<autofill::PasswordForm>> ConvertScopedVector(
|
| ScopedVector<autofill::PasswordForm> old_vector) {
|
| - std::vector<scoped_ptr<autofill::PasswordForm>> new_vector;
|
| + std::vector<std::unique_ptr<autofill::PasswordForm>> new_vector;
|
| new_vector.reserve(old_vector.size());
|
| for (auto* form : old_vector) {
|
| - new_vector.push_back(make_scoped_ptr(form));
|
| + new_vector.push_back(base::WrapUnique(form));
|
| }
|
| old_vector.weak_clear(); // All owned by |new_vector| by now.
|
| return new_vector;
|
|
|