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

Unified Diff: components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc

Issue 866983003: GetLoginsRequest: Use ScopedVector to express ownership of forms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@324291_scopedvector
Patch Set: Fix Mac unittest 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: components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
diff --git a/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc b/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
index e7bf309f978fe99980af153bb8a25c85d5ee5d7f..313a40fe0c46ba257315730caea6b54eb9479a9f 100644
--- a/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
+++ b/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
@@ -59,21 +59,14 @@ class TestPasswordManagerClient
}
bool PromptUserToChooseCredentials(
- const std::vector<autofill::PasswordForm*>& local_forms,
- const std::vector<autofill::PasswordForm*>& federated_forms,
+ ScopedVector<autofill::PasswordForm> local_forms,
+ ScopedVector<autofill::PasswordForm> federated_forms,
base::Callback<void(const password_manager::CredentialInfo&)> callback)
override {
- // TODO(melandory): Use ScopedVector instead of std::vector in arguments.
- // ContentCredentialManagerDispatcher::OnGetPasswordStoreResults contains a
- // memory leak because of this.
EXPECT_FALSE(local_forms.empty() && federated_forms.empty());
did_prompt_user_to_choose_ = true;
- ScopedVector<autofill::PasswordForm> local_entries;
- local_entries.assign(local_forms.begin(), local_forms.end());
- ScopedVector<autofill::PasswordForm> federated_entries;
- federated_entries.assign(federated_forms.begin(), federated_forms.end());
password_manager::CredentialInfo info(
- local_forms.empty() ? *federated_forms[0] : *local_entries[0],
+ local_forms.empty() ? *federated_forms[0] : *local_forms[0],
local_forms.empty()
? password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED
: password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL);

Powered by Google App Engine
This is Rietveld 408576698