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

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

Issue 906973007: PasswordStore: Clean up expectations about rewriting vectors of forms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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_store_x.cc
diff --git a/chrome/browser/password_manager/password_store_x.cc b/chrome/browser/password_manager/password_store_x.cc
index 595770f599d5d222c47aca3eed0661fdd58341bf..9cd6ca985e9424ad5dc08263ce2f125bfe2b9702 100644
--- a/chrome/browser/password_manager/password_store_x.cc
+++ b/chrome/browser/password_manager/password_store_x.cc
@@ -257,8 +257,12 @@ bool PasswordStoreX::allow_default_store() {
ssize_t PasswordStoreX::MigrateLogins() {
DCHECK(backend_.get());
ScopedVector<autofill::PasswordForm> forms;
+ ScopedVector<autofill::PasswordForm> blacklist_forms;
bool ok = PasswordStoreDefault::FillAutofillableLogins(&forms) &&
- PasswordStoreDefault::FillBlacklistLogins(&forms);
+ PasswordStoreDefault::FillBlacklistLogins(&blacklist_forms);
+ forms.reserve(forms.size() + blacklist_forms.size());
+ forms.insert(forms.end(), blacklist_forms.begin(), blacklist_forms.end());
+ blacklist_forms.weak_clear();
if (ok) {
// We add all the passwords (and blacklist entries) to the native backend
// before attempting to remove any from the login database, to make sure we

Powered by Google App Engine
This is Rietveld 408576698