Convert PasswordStore::GetLogins to not depend on CancelableRequest

Please note, in order to reduce the CL size, I only converted GetLogins. There will be another CL to convert GetAutofillableLogins and GetBlackListLogins. As a result, there's a bunch of old code I can not get rid of now.
e.g.
PasswordStore::GetLoginRequest
PasswordStore::Schedule
PasswordStoreConsumer::OnPasswordStoreRequestDone
etc

Will clean them up in next CL

BUG=155883,162337

Review URL: https://chromiumcodereview.appspot.com/11415106

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173076 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 4 deletions

diff --git a/chrome/browser/sync/test/integration/passwords_helper.cc b/chrome/browser/sync/test/integration/passwords_helper.cc
index e54d89d..fd8836b 100644
--- a/chrome/browser/sync/test/integration/passwords_helper.cc
+++ b/chrome/browser/sync/test/integration/passwords_helper.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/sync/test/integration/passwords_helper.h"
 
+#include "base/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
@@ -43,13 +44,19 @@ class PasswordStoreConsumerHelper : public PasswordStoreConsumer {
 
   virtual void OnPasswordStoreRequestDone(
       CancelableRequestProvider::Handle handle,
-      const std::vector<PasswordForm*>& result) {
+      const std::vector<PasswordForm*>& result) OVERRIDE {
+    // TODO(kaiwang): Remove this function.
+    NOTREACHED();
+  }
+
+  virtual void OnGetPasswordStoreResults(
+      const std::vector<PasswordForm*>& result) OVERRIDE {
     result_->clear();
     for (std::vector<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.
+         it != result.end();
+         ++it) {
       result_->push_back(**it);
+      delete *it;
     }
 
     // Quit the message loop to wake up passwords_helper::GetLogins.