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

chrome/test/live_sync/live_passwords_sync_test.h

-// 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.
 
 #ifndef CHROME_TEST_LIVE_SYNC_LIVE_PASSWORDS_SYNC_TEST_H_
 #define CHROME_TEST_LIVE_SYNC_LIVE_PASSWORDS_SYNC_TEST_H_
 #pragma once
 
 #include <set>
 
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/password_manager/password_store_consumer.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/test/live_sync/live_sync_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "chrome/test/signaling_task.h"
 #include "webkit/glue/password_form.h"
 
 class LivePasswordsSyncTest : public LiveSyncTest {
  public:
   explicit LivePasswordsSyncTest(TestType test_type)
       : LiveSyncTest(test_type) {}
@@ skipping 35 matching lines @@
   }
 
  private:
   class PasswordStoreConsumerHelper : public PasswordStoreConsumer {
    public:
     explicit PasswordStoreConsumerHelper(
         std::vector<webkit_glue::PasswordForm>& result)
         : PasswordStoreConsumer(), result_(result) {}
 
     virtual void OnPasswordStoreRequestDone(
-        int handle, const std::vector<webkit_glue::PasswordForm*>& result) {
+        CancelableRequestProvider::Handle handle,
+        const std::vector<webkit_glue::PasswordForm*>& result) {
       result_.clear();
       for (std::vector<webkit_glue::PasswordForm*>::const_iterator it =
            result.begin(); it != result.end(); ++it) {
         // Make a copy of the form since it gets deallocated after the caller of
         // this method returns.
         result_.push_back(**it);
       }
       MessageLoopForUI::current()->Quit();
     }
 
@@ skipping 38 matching lines @@
 class ManyClientLivePasswordsSyncTest : public LivePasswordsSyncTest {
  public:
   ManyClientLivePasswordsSyncTest() : LivePasswordsSyncTest(MANY_CLIENT) {}
   virtual ~ManyClientLivePasswordsSyncTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ManyClientLivePasswordsSyncTest);
 };
 
 #endif  // CHROME_TEST_LIVE_SYNC_LIVE_PASSWORDS_SYNC_TEST_H_