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

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

Issue 9586023: Fix memory failures in PasswordManager tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « no previous file | chrome/browser/password_manager/password_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/password_manager/password_manager.cc
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index e235fa28e485c5e3dc4ea6c012806ed1e5381e4e..0eb421e708a397f678606881b4e7f5ef750d80c6 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -82,12 +82,12 @@ void PasswordManager::ProvisionallySavePassword(const PasswordForm& form) {
if (form.password_value.empty())
return;
- PasswordFormManager* manager = NULL;
+ scoped_ptr<PasswordFormManager> manager;
for (ScopedVector<PasswordFormManager>::iterator iter =
pending_login_managers_.begin();
iter != pending_login_managers_.end(); ++iter) {
if ((*iter)->DoesManage(form)) {
- manager = *iter;
+ manager.reset(*iter);
dhollowa 2012/03/02 23:49:35 A comment here would be nice. "Transfer ownership
pending_login_managers_.weak_erase(iter);
break;
}
@@ -95,7 +95,7 @@ void PasswordManager::ProvisionallySavePassword(const PasswordForm& form) {
// If we didn't find a manager, this means a form was submitted without
// first loading the page containing the form. Don't offer to save
// passwords in this case.
- if (!manager)
+ if (!manager.get())
return;
// If we found a manager but it didn't finish matching yet, the user has
@@ -115,7 +115,7 @@ void PasswordManager::ProvisionallySavePassword(const PasswordForm& form) {
!delegate_->DidLastPageLoadEncounterSSLErrors();
provisionally_saved_form.preferred = true;
manager->ProvisionallySave(provisionally_saved_form);
- provisional_save_manager_.reset(manager);
+ provisional_save_manager_.swap(manager);
}
void PasswordManager::SetObserver(LoginModelObserver* observer) {
« no previous file with comments | « no previous file | chrome/browser/password_manager/password_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698