DOMUI: Cancel pending queries to the PasswordStore on destruction to avoid

chrome/browser/dom_ui/options/password_manager_handler.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/dom_ui/options/password_manager_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 134 matching lines @@
   ListValue entries;
   for (size_t i = 0; i < password_exception_list_.size(); ++i) {
     entries.Append(new StringValue(
         net::FormatUrl(password_exception_list_[i]->origin, languages_)));
   }
 
   dom_ui_->CallJavascriptFunction(
       L"PasswordManager.setPasswordExceptionsList", entries);
 }
 
+PasswordManagerHandler::ListPopulater::ListPopulater(
+    PasswordManagerHandler* page) : page_(page),
+                                    pending_login_query_(0) {
+}
+
+PasswordManagerHandler::ListPopulater::~ListPopulater() {
+  page_->GetPasswordStore()->CancelLoginsQuery(pending_login_query_);
+}
+
+PasswordManagerHandler::PasswordListPopulater::PasswordListPopulater(
+    PasswordManagerHandler* page) : ListPopulater(page) {
+}
+
 void PasswordManagerHandler::PasswordListPopulater::Populate() {
   DCHECK(!pending_login_query_);
   PasswordStore* store = page_->GetPasswordStore();
   if (store != NULL)
     pending_login_query_ = store->GetAutofillableLogins(this);
   else
     LOG(ERROR) << "No password store! Cannot display passwords.";
 }
 
 void PasswordManagerHandler::PasswordListPopulater::
     OnPasswordStoreRequestDone(int handle,
     const std::vector<webkit_glue::PasswordForm*>& result) {
   DCHECK_EQ(pending_login_query_, handle);
   pending_login_query_ = 0;
   page_->password_list_ = result;
   page_->SetPasswordList();
 }
 
+PasswordManagerHandler::PasswordExceptionListPopulater::
+    PasswordExceptionListPopulater(PasswordManagerHandler* page)
+        : ListPopulater(page) {
+}
+
 void PasswordManagerHandler::PasswordExceptionListPopulater::Populate() {
   DCHECK(!pending_login_query_);
   PasswordStore* store = page_->GetPasswordStore();
   if (store != NULL)
     pending_login_query_ = store->GetBlacklistLogins(this);
   else
     LOG(ERROR) << "No password store! Cannot display exceptions.";
 }
 
 void PasswordManagerHandler::PasswordExceptionListPopulater::
     OnPasswordStoreRequestDone(int handle,
     const std::vector<webkit_glue::PasswordForm*>& result) {
   DCHECK_EQ(pending_login_query_, handle);
   pending_login_query_ = 0;
   page_->password_exception_list_ = result;
   page_->SetPasswordExceptionList();
 }