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

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

Issue 6646051: Fix DCHECK, memory leak, and refactor PasswordStore to use CancelableRequest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use non-zero tests until http://crbug.com/77650 is addressed. Created 9 years, 9 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_mac.cc
diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc
index 2945032fa79a399f3a69349ff6245e82799f59db..ee1222c6b1f3d2a21996718984bde64a2650d8f5 100644
--- a/chrome/browser/password_manager/password_store_mac.cc
+++ b/chrome/browser/password_manager/password_store_mac.cc
@@ -886,7 +886,7 @@ void PasswordStoreMac::GetLoginsImpl(GetLoginsRequest* request,
std::vector<PasswordForm*> database_forms;
login_metadata_db_->GetLogins(form, &database_forms);
- std::vector<PasswordForm*> merged_forms;
+ std::vector<PasswordForm*>& merged_forms = request->value;
internal_keychain_helpers::MergePasswordForms(&keychain_forms,
&database_forms,
&merged_forms);
@@ -904,19 +904,17 @@ void PasswordStoreMac::GetLoginsImpl(GetLoginsRequest* request,
RemoveDatabaseForms(database_forms);
STLDeleteElements(&database_forms);
- NotifyConsumer(request, merged_forms);
+ ForwardLoginsResult(request);
}
void PasswordStoreMac::GetBlacklistLoginsImpl(GetLoginsRequest* request) {
- std::vector<PasswordForm*> database_forms;
- FillBlacklistLogins(&database_forms);
- NotifyConsumer(request, database_forms);
+ FillBlacklistLogins(&request->value);
+ ForwardLoginsResult(request);
}
void PasswordStoreMac::GetAutofillableLoginsImpl(GetLoginsRequest* request) {
- std::vector<PasswordForm*> database_forms;
- FillAutofillableLogins(&database_forms);
- NotifyConsumer(request, database_forms);
+ FillAutofillableLogins(&request->value);
+ ForwardLoginsResult(request);
}
bool PasswordStoreMac::FillAutofillableLogins(

Powered by Google App Engine
This is Rietveld 408576698