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

chrome/browser/password_manager/password_store_win.cc

Index: chrome/browser/password_manager/password_store_win.cc
diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc
deleted file mode 100644
index a3c45b6bf993f2a90fabfd5e05ef5fca8c753927..0000000000000000000000000000000000000000
--- a/chrome/browser/password_manager/password_store_win.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) 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_win.h"
-
-#include "base/logging.h"
-#include "base/string_util.h"
-#include "chrome/browser/password_manager/ie7_password.h"
-#include "chrome/browser/password_manager/password_manager.h"
-#include "chrome/browser/profile.h"
-
-using std::map;
-using std::vector;
-
-PasswordStoreWin::PasswordStoreWin(WebDataService* web_data_service)
-    : PasswordStoreDefault(web_data_service) {
-}
-
-void PasswordStoreWin::OnWebDataServiceRequestDone(
-    WebDataService::Handle h, const WDTypedResult *result) {
-  // Look up this handle in our request map to get the original
-  // GetLoginsRequest.
-  PendingRequestMap::const_iterator it(pending_requests_.find(h));
-  DCHECK(it != pending_requests_.end());
-
-  GetLoginsRequest* request = (*it).second;
-  pending_requests_.erase(h);
-
-  DCHECK(result);
-  if (!result)
-    return;
-
-  switch (result->GetType()) {
-    case PASSWORD_RESULT: {
-      // This is a response from WebDataService::GetLogins.
-      const WDResult<std::vector<PasswordForm*> >* r =
-        static_cast<const WDResult<std::vector<PasswordForm*> >*>(result);
-      std::vector<PasswordForm*> result_value = r->GetValue();
-
-      if (result_value.size()) {
-        // If we found some results then return them now.
-        NotifyConsumer(request, result_value);
-        return;
-      } else {
-        // Otherwise try finding IE7 logins.
-        IE7PasswordInfo info;
-        std::wstring url = ASCIIToWide(request->form.origin.spec());
-        info.url_hash = ie7_password::GetUrlHash(url);
-
-        WebDataService::Handle web_data_handle =
-            web_data_service_->GetIE7Login(info, this);
-        pending_requests_.insert(PendingRequestMap::value_type(
-          web_data_handle, request));
-      }
-      break;
-    }
-
-    case PASSWORD_IE7_RESULT: {
-      // This is a response from WebDataService::GetIE7Login.
-      PasswordForm* ie7_form = GetIE7Result(result, request->form);
-
-      std::vector<PasswordForm*> forms;
-      if (ie7_form)
-        forms.push_back(ie7_form);
-
-      NotifyConsumer(request, forms);
-      break;
-    }
-  }
-}
-
-PasswordForm* PasswordStoreWin::GetIE7Result(const WDTypedResult *result,
-                                             const PasswordForm& form) {
-  const WDResult<IE7PasswordInfo>* r =
-    static_cast<const WDResult<IE7PasswordInfo>*>(result);
-  IE7PasswordInfo info = r->GetValue();
-
-  if (!info.encrypted_data.empty()) {
-    // We got a result.
-    // Delete the entry. If it's good we will add it to the real saved password
-    // table.
-    web_data_service_->RemoveIE7Login(info);
-    std::wstring username;
-    std::wstring password;
-    std::wstring url = ASCIIToWide(form.origin.spec());
-    if (!ie7_password::DecryptPassword(url, info.encrypted_data,
-                                       &username, &password)) {
-      return NULL;
-    }
-
-    PasswordForm* auto_fill = new PasswordForm(form);
-    auto_fill->username_value = username;
-    auto_fill->password_value = password;
-    auto_fill->preferred = true;
-    auto_fill->ssl_valid = form.origin.SchemeIsSecure();
-    auto_fill->date_created = info.date_created;
-    // Add this PasswordForm to the saved password table.
-    AddLogin(*auto_fill);
-    return auto_fill;
-  }
-  return NULL;
-}