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

Unified Diff: components/password_manager/core/browser/password_store.cc

Issue 825773003: PasswordStore: Use ScopedVector to express ownership of forms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Leaks fixed + VABR->vabr Created 5 years, 11 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/core/browser/password_store.cc
diff --git a/components/password_manager/core/browser/password_store.cc b/components/password_manager/core/browser/password_store.cc
index b5d55c326a09e82903caf0c76f21c4c4cf9dde60..0fa211b73e3a24a7d778e929952df4a9108a9be4 100644
--- a/components/password_manager/core/browser/password_store.cc
+++ b/components/password_manager/core/browser/password_store.cc
@@ -145,7 +145,7 @@ void PasswordStore::GetLogins(const PasswordForm& form,
request->set_ignore_logins_cutoff(ignore_logins_cutoff);
ConsumerCallbackRunner callback_runner = base::Bind(
- &PasswordStore::CopyAndForwardLoginsResult, this, base::Owned(request));
+ &PasswordStore::CopyAndForwardLoginsResult, base::Owned(request));
ScheduleTask(base::Bind(&PasswordStore::GetLoginsImpl, this, form,
prompt_policy, callback_runner));
}
@@ -207,17 +207,21 @@ PasswordStore::GetBackgroundTaskRunner() {
return db_thread_runner_;
}
+// static
void PasswordStore::ForwardLoginsResult(GetLoginsRequest* request) {
request->ApplyIgnoreLoginsCutoff();
request->ForwardResult();
}
+// static
void PasswordStore::CopyAndForwardLoginsResult(
PasswordStore::GetLoginsRequest* request,
- const std::vector<PasswordForm*>& matched_forms) {
+ ScopedVector<autofill::PasswordForm>* matched_forms) {
// Copy the contents of |matched_forms| into the request. The request takes
// ownership of the PasswordForm elements.
- *(request->result()) = matched_forms;
+ request->result()->swap(matched_forms->get());
+ matched_forms->weak_clear(); // TODO(vabr): Change request to have a
+ // ScopedVector instead.
ForwardLoginsResult(request);
}

Powered by Google App Engine
This is Rietveld 408576698