Revert the password manager refactoring -- it failed reliability tests.

chrome/browser/password_manager/password_store.cc

Index: chrome/browser/password_manager/password_store.cc
diff --git a/chrome/browser/password_manager/password_store.cc b/chrome/browser/password_manager/password_store.cc
deleted file mode 100644
index 77c60810f1df74207eabf8d3bb2dcbbc2214342f..0000000000000000000000000000000000000000
--- a/chrome/browser/password_manager/password_store.cc
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) 2006-2009 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/password_manager/password_store.h"
-
-#include "base/scoped_ptr.h"
-#include "base/task.h"
-
-using std::vector;
-
-PasswordStore::PasswordStore() : handle_(0) {
-}
-
-bool PasswordStore::Init() {
-  thread_.reset(new base::Thread("Chrome_PasswordStore_Thread"));
-
-  if (!thread_->Start()) {
-    thread_.reset(NULL);
-    return false;
-  }
-
-  return true;
-}
-
-void PasswordStore::ScheduleTask(Task* task) {
-  if (thread_.get()) {
-    thread_->message_loop()->PostTask(FROM_HERE, task);
-  }
-}
-
-void PasswordStore::AddLogin(const PasswordForm& form) {
-  ScheduleTask(NewRunnableMethod(
-      this, &PasswordStore::AddLoginImpl, form));
-}
-
-void PasswordStore::UpdateLogin(const PasswordForm& form) {
-  ScheduleTask(NewRunnableMethod(
-      this, &PasswordStore::UpdateLoginImpl, form));
-}
-
-void PasswordStore::RemoveLogin(const PasswordForm& form) {
-  ScheduleTask(NewRunnableMethod(
-      this, &PasswordStore::RemoveLoginImpl, form));
-}
-
-int PasswordStore::GetLogins(const PasswordForm& form,
-                             PasswordStoreConsumer* consumer) {
-  int handle = handle_++;
-  GetLoginsRequest* request = new GetLoginsRequest(form, consumer, handle);
-
-  AutoLock l(pending_requests_lock_);
-  pending_requests_.insert(handle);
-
-  ScheduleTask(NewRunnableMethod(this, &PasswordStore::GetLoginsImpl, request));
-  return handle;
-}
-
-void PasswordStore::NotifyConsumer(GetLoginsRequest* request,
-                                   const vector<PasswordForm*> forms) {
-  scoped_ptr<GetLoginsRequest> request_ptr(request);
-
-  request->message_loop->PostTask(FROM_HERE,
-      NewRunnableMethod(this,
-                        &PasswordStore::NotifyConsumerImpl,
-                        request->consumer, request->handle, forms));
-}
-
-void PasswordStore::NotifyConsumerImpl(PasswordStoreConsumer* consumer,
-                                       int handle,
-                                       const vector<PasswordForm*> forms) {
-  {  // Scope for the AutoLock.
-    AutoLock l(pending_requests_lock_);
-
-    // Don't notify the consumer if the request was canceled.
-    if (pending_requests_.find(handle) == pending_requests_.end())
-      return;
-    pending_requests_.erase(handle);
-  }
-
-  consumer->OnPasswordStoreRequestDone(handle, forms);
-}
-
-void PasswordStore::CancelLoginsQuery(int handle) {
-  AutoLock l(pending_requests_lock_);
-  pending_requests_.erase(handle);
-}
-
-PasswordStore::GetLoginsRequest::GetLoginsRequest(
-    const PasswordForm& form,
-    PasswordStoreConsumer* consumer,
-    int handle)
-      : form(form),
-        consumer(consumer),
-        handle(handle),
-        message_loop(MessageLoop::current()) {
-}