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

chrome/browser/password_manager/password_store.h

Index: chrome/browser/password_manager/password_store.h
diff --git a/chrome/browser/password_manager/password_store.h b/chrome/browser/password_manager/password_store.h
deleted file mode 100644
index 88616bab759288eb4ec3113606ae72ffda959e2d..0000000000000000000000000000000000000000
--- a/chrome/browser/password_manager/password_store.h
+++ /dev/null
@@ -1,115 +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.
-
-#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE
-#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE
-
-#include <set>
-#include <vector>
-
-#include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
-#include "base/thread.h"
-#include "webkit/glue/password_form.h"
-
-class Profile;
-class Task;
-
-class PasswordStoreConsumer {
- public:
-  virtual ~PasswordStoreConsumer() {}
-  // Call this when the request is finished. If there are no results, call it
-  // anyway with an empty vector.
-  virtual void OnPasswordStoreRequestDone(
-      int handle, const std::vector<PasswordForm*>& result) = 0;
-};
-
-// Interface for storing form passwords in a platform-specific secure way.
-class PasswordStore : public base::RefCountedThreadSafe<PasswordStore> {
- public:
-  PasswordStore();
-  virtual ~PasswordStore() {}
-
-  // Reimplement this to add custom initialization. Always call this too.
-  virtual bool Init();
-
-  // Adds the given PasswordForm to the secure password store asynchronously.
-  void AddLogin(const PasswordForm& form);
-  // Updates the matching PasswordForm in the secure password store (async).
-  void UpdateLogin(const PasswordForm& form);
-  // Removes the matching PasswordForm from the secure password store (async).
-  void RemoveLogin(const PasswordForm& form);
-  // Searches for a matching PasswordForm and returns a handle so the async
-  // request can be tracked. Implement the PasswordStoreConsumer interface to
-  // be notified on completion.
-  int GetLogins(const PasswordForm& form,
-                PasswordStoreConsumer* consumer);
-
-  // Cancels a previous GetLogins query (async)
-  virtual void CancelLoginsQuery(int handle);
-
- protected:
-  // Simple container class that represents a GetLogins request.
-  // Created in GetLogins and passed to GetLoginsImpl.
-  struct GetLoginsRequest {
-    GetLoginsRequest(const PasswordForm& f,
-                     PasswordStoreConsumer* c,
-                     int handle);
-
-    // The query form that was originally passed to GetLogins
-    PasswordForm form;
-    // The consumer to notify when this GetLogins request is complete
-    PasswordStoreConsumer* consumer;
-    // A unique handle for the request
-    int handle;
-    // The message loop that the GetLogins request was made from.  We send the
-    // result back to the consumer in this same message loop.
-    MessageLoop* message_loop;
-
-    DISALLOW_COPY_AND_ASSIGN(GetLoginsRequest);
-  };
-
-  // Schedule the given task to be run in the PasswordStore's own thread.
-  void ScheduleTask(Task* task);
-
-  // These will be run in PasswordStore's own thread.
-  // Synchronous implementation to add the given login.
-  virtual void AddLoginImpl(const PasswordForm& form) = 0;
-  // Synchronous implementation to update the given login.
-  virtual void UpdateLoginImpl(const PasswordForm& form) = 0;
-  // Synchronous implementation to remove the given login.
-  virtual void RemoveLoginImpl(const PasswordForm& form) = 0;
-  // Should find all PasswordForms with the same signon_realm. The results
-  // will then be scored by the PasswordFormManager. Once they are found
-  // (or not), the consumer should be notified.
-  virtual void GetLoginsImpl(GetLoginsRequest* request) = 0;
-
-  // Notifies the consumer that GetLoginsImpl() is complete.
-  void NotifyConsumer(GetLoginsRequest* request,
-                      const std::vector<PasswordForm*> forms);
-
-  // Next handle to return from GetLogins() to allow callers to track
-  // their request.
-  int handle_;
-
-  // Thread that the synchronous methods are run in.
-  scoped_ptr<base::Thread> thread_;
-
- private:
-  // Called by NotifyConsumer, but runs in the consumer's thread.  Will not
-  // call the consumer if the request was canceled.  This extra layer is here so
-  // that PasswordStoreConsumer doesn't have to be reference counted (we assume
-  // consumers will cancel their requests before they are destroyed).
-  void NotifyConsumerImpl(PasswordStoreConsumer* consumer, int handle,
-                          const std::vector<PasswordForm*> forms);
-
-  // List of pending request handles.  Handles are removed from the set when
-  // they finish or are canceled.
-  Lock pending_requests_lock_;
-  std::set<int> pending_requests_;
-
-  DISALLOW_COPY_AND_ASSIGN(PasswordStore);
-};
-
-#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE