Fix DCHECK, memory leak, and refactor PasswordStore to use CancelableRequest

chrome/browser/password_manager/password_store_default.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/password_manager/password_store_default.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ skipping 55 matching lines @@
     changes.push_back(PasswordStoreChange(PasswordStoreChange::REMOVE, form));
     NotificationService::current()->Notify(
         NotificationType::LOGINS_CHANGED,
         Source<PasswordStore>(this),
         Details<PasswordStoreChangeList>(&changes));
   }
 }
 
 void PasswordStoreDefault::RemoveLoginsCreatedBetweenImpl(
     const base::Time& delete_begin, const base::Time& delete_end) {
+

[James Hawkins, 2011/03/16 22:39:35]

Remove blank line.

   std::vector<PasswordForm*> forms;
   if (login_db_->GetLoginsCreatedBetween(delete_begin, delete_end, &forms)) {
     if (login_db_->RemoveLoginsCreatedBetween(delete_begin, delete_end)) {
       PasswordStoreChangeList changes;
       for (std::vector<PasswordForm*>::const_iterator it = forms.begin();
            it != forms.end(); ++it) {
         changes.push_back(PasswordStoreChange(PasswordStoreChange::REMOVE,
                                               **it));
       }
       NotificationService::current()->Notify(
           NotificationType::LOGINS_CHANGED,
           Source<PasswordStore>(this),
           Details<PasswordStoreChangeList>(&changes));
     }
   }
   STLDeleteElements(&forms);
 }
 
 void PasswordStoreDefault::GetLoginsImpl(
     GetLoginsRequest* request, const webkit_glue::PasswordForm& form) {
-  std::vector<PasswordForm*> forms;
-  login_db_->GetLogins(form, &forms);
-  NotifyConsumer(request, forms);
+  login_db_->GetLogins(form, &request->value);
+  ForwardLoginsResult(request);
 }
 
 void PasswordStoreDefault::GetAutofillableLoginsImpl(
     GetLoginsRequest* request) {
-  std::vector<PasswordForm*> forms;
-  FillAutofillableLogins(&forms);
-  NotifyConsumer(request, forms);
+  FillAutofillableLogins(&request->value);
+  ForwardLoginsResult(request);
 }
 
 void PasswordStoreDefault::GetBlacklistLoginsImpl(
     GetLoginsRequest* request) {
-  std::vector<PasswordForm*> forms;
-  FillBlacklistLogins(&forms);
-  NotifyConsumer(request, forms);
+  FillBlacklistLogins(&request->value);
+  ForwardLoginsResult(request);
 }
 
 bool PasswordStoreDefault::FillAutofillableLogins(
          std::vector<PasswordForm*>* forms) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   return login_db_->GetAutofillableLogins(forms);
 }
 
 bool PasswordStoreDefault::FillBlacklistLogins(
          std::vector<PasswordForm*>* forms) {
@@ skipping 31 matching lines @@
        it != forms.end(); ++it) {
     AddLogin(**it);
     web_data_service_->RemoveLogin(**it);
     delete *it;
   }
   if (handles_.empty()) {
     profile_->GetPrefs()->RegisterBooleanPref(prefs::kLoginDatabaseMigrated,
                                               true);
   }
 }