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

chrome/browser/automation/automation_provider_observers.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_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_
 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 849 matching lines @@
   virtual void ImportItemStarted(importer::ImportItem item) OVERRIDE;
   virtual void ImportItemEnded(importer::ImportItem item) OVERRIDE;
   virtual void ImportEnded() OVERRIDE;
 
  private:
   base::WeakPtr<AutomationProvider> provider_;
   scoped_ptr<IPC::Message> reply_message_;
 };
 
 // Allows automation provider to wait for getting passwords to finish.
-class AutomationProviderGetPasswordsObserver
-    : public PasswordStoreConsumer {
+class AutomationProviderGetPasswordsObserver : public PasswordStoreConsumer {
  public:
   AutomationProviderGetPasswordsObserver(
       AutomationProvider* provider,
       IPC::Message* reply_message);
   virtual ~AutomationProviderGetPasswordsObserver();
 
   virtual void OnPasswordStoreRequestDone(
-      int handle, const std::vector<webkit_glue::PasswordForm*>& result);
+      PasswordStore::Handle handle,
+      const std::vector<webkit_glue::PasswordForm*>& result);
 
  private:
   base::WeakPtr<AutomationProvider> provider_;
   scoped_ptr<IPC::Message> reply_message_;
 };
 
 // Allows the automation provider to wait for clearing browser data to finish.
 class AutomationProviderBrowsingDataObserver
     : public BrowsingDataRemover::Observer {
  public:
@@ skipping 287 matching lines @@
   // Sends the |reply_message_| to |automation_| indicating we're done.
   void RunOnUIThread();
 
   base::WeakPtr<AutomationProvider> automation_;
   scoped_ptr<IPC::Message> reply_message_;
 
   DISALLOW_COPY_AND_ASSIGN(WaitForProcessLauncherThreadToGoIdleObserver);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_