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

chrome/browser/ui/webui/options/password_manager_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
 
 #include <string>
 #include <vector>
 
+#include "base/memory/scoped_vector.h"
 #include "chrome/browser/password_manager/password_store.h"
+#include "chrome/browser/password_manager/password_store_consumer.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 
 class PasswordManagerHandler : public OptionsPageUIHandler,
                                public PasswordStore::Observer {
  public:
   PasswordManagerHandler();
   virtual ~PasswordManagerHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
@@ skipping 37 matching lines @@
   class ListPopulater : public PasswordStoreConsumer {
    public:
     explicit ListPopulater(PasswordManagerHandler* page);
     virtual ~ListPopulater();
 
     // Send a query to the password store to populate a list.
     virtual void Populate() = 0;
 
     // Send the password store's reply back to the handler.
     virtual void OnPasswordStoreRequestDone(
-        int handle, const std::vector<webkit_glue::PasswordForm*>& result) = 0;
+        CancelableRequestProvider::Handle handle,
+        const std::vector<webkit_glue::PasswordForm*>& result) = 0;
 
    protected:
     PasswordManagerHandler* page_;
-    int pending_login_query_;
+    CancelableRequestProvider::Handle pending_login_query_;
   };
 
   // A short class to mediate requests to the password store for passwordlist.
   class PasswordListPopulater : public ListPopulater {
    public:
     explicit PasswordListPopulater(PasswordManagerHandler* page);
 
     // Send a query to the password store to populate a password list.
     virtual void Populate();
 
     // Send the password store's reply back to the handler.
     virtual void OnPasswordStoreRequestDone(
-        int handle, const std::vector<webkit_glue::PasswordForm*>& result);
+        CancelableRequestProvider::Handle handle,
+        const std::vector<webkit_glue::PasswordForm*>& result);
   };
 
   // A short class to mediate requests to the password store for exceptions.
   class PasswordExceptionListPopulater : public ListPopulater {
    public:
     explicit PasswordExceptionListPopulater(PasswordManagerHandler* page);
 
     // Send a query to the password store to populate a passwordException list.
     virtual void Populate();
 
     // Send the password store's reply back to the handler.
     virtual void OnPasswordStoreRequestDone(
-        int handle, const std::vector<webkit_glue::PasswordForm*>& result);
+        CancelableRequestProvider::Handle handle,
+        const std::vector<webkit_glue::PasswordForm*>& result);
   };
 
   // Password store consumer for populating the password list and exceptions.
   PasswordListPopulater populater_;
   PasswordExceptionListPopulater exception_populater_;
 
-  std::vector<webkit_glue::PasswordForm*> password_list_;
-  std::vector<webkit_glue::PasswordForm*> password_exception_list_;
+  ScopedVector<webkit_glue::PasswordForm> password_list_;
+  ScopedVector<webkit_glue::PasswordForm> password_exception_list_;
 
   // User's pref
   std::string languages_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordManagerHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_