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

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index da2571612bedd5a892ea2ffd451ce7b0a6631640..e39eb95eb429d6edf29d0044d5fc5610d7ce31dd 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1093,23 +1093,9 @@
         'browser/password_manager/ie7_password.h',
         'browser/password_manager/password_form_manager.cc',
         'browser/password_manager/password_form_manager.h',
+        'browser/password_manager/password_form_manager_win.cc',
         'browser/password_manager/password_manager.cc',
         'browser/password_manager/password_manager.h',
-        'browser/password_manager/password_store.cc',
-        'browser/password_manager/password_store.h',
-        'browser/password_manager/password_store_default.cc',
-        'browser/password_manager/password_store_default.h',
-        # Temporarily disabled while we figure some stuff out.
-        # http://code.google.com/p/chromium/issues/detail?id=12351
-        # 'browser/password_manager/password_store_gnome.h',
-        # 'browser/password_manager/password_store_gnome.cc',
-        # 'browser/password_manager/password_store_kwallet.h',
-        # 'browser/password_manager/password_store_kwallet.cc',
-        'browser/password_manager/password_store_mac_internal.h',
-        'browser/password_manager/password_store_mac.h',
-        'browser/password_manager/password_store_mac.cc',

[stuartmorgan, 2009/05/26 22:54:03]

There's a corresponding _unittest for this file that will also need to be
removed from chrome.gyp

-        'browser/password_manager/password_store_win.h',
-        'browser/password_manager/password_store_win.cc',
         'browser/plugin_installer.cc',
         'browser/plugin_installer.h',
         'browser/plugin_process_host.cc',
@@ -1563,10 +1549,6 @@
         }],
         ['OS=="linux"', {
           'dependencies': [
-            # Temporarily disabled while we figure some stuff out.
-            # http://code.google.com/p/chromium/issues/detail?id=12351
-            # '../build/linux/system.gyp:dbus-glib',
-            # '../build/linux/system.gyp:gnome-keyring',
             '../build/linux/system.gyp:gtk',
           ],
           'sources!': [
@@ -1576,8 +1558,6 @@
             'browser/debugger/debugger_shell_stubs.cc',
             # Windows-specific files.
             'browser/download/download_exe.cc',
-            'browser/password_manager/password_store_win.cc',
-            'browser/password_manager/password_store_win.h',
           ],
           'conditions': [
             ['linux_breakpad==1', {
@@ -1610,12 +1590,6 @@
             'browser/bookmarks/bookmark_context_menu.cc',
             'browser/bookmarks/bookmark_drop_info.cc',
             'browser/debugger/debugger_shell_stubs.cc',
-            'browser/password_manager/password_store_gnome.h',
-            'browser/password_manager/password_store_gnome.cc',
-            'browser/password_manager/password_store_kwallet.h',
-            'browser/password_manager/password_store_kwallet.cc',
-            'browser/password_manager/password_store_win.cc',
-            'browser/password_manager/password_store_win.h',
           ],
           'sources': [
             # Build the necessary GTM sources
@@ -1662,10 +1636,6 @@
           'sources!': [
             'browser/debugger/debugger_shell_stubs.cc',
             'browser/history/history_publisher_none.cc',
-            'browser/password_manager/password_store_gnome.h',
-            'browser/password_manager/password_store_gnome.cc',
-            'browser/password_manager/password_store_kwallet.h',
-            'browser/password_manager/password_store_kwallet.cc',
           ],
           'configurations': {
             'Debug': {