Re-land the password store work from bug 8205, with changes that should fix b...

chrome/chrome.gyp

Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp	(revision 17245)
+++ chrome/chrome.gyp	(working copy)
@@ -1125,9 +1125,23 @@
         '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',
+        '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',
@@ -1584,6 +1598,10 @@
         }],
         ['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!': [
@@ -1593,6 +1611,8 @@
             'browser/extensions/extension_view.cc',
             'browser/extensions/extension_view.h',
                     # Windows-specific files.
+            'browser/password_manager/password_store_win.cc',
+            'browser/password_manager/password_store_win.h',
           ],
           'conditions': [
             ['linux_breakpad==1', {
@@ -1636,6 +1656,12 @@
             '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',
             'browser/extensions/extension_shelf.cc',
             'browser/extensions/extension_shelf.h',
             'browser/extensions/extension_view.cc',
@@ -1688,6 +1714,10 @@
           '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': {
@@ -3063,6 +3093,7 @@
         'browser/net/url_fixer_upper_unittest.cc',
         'browser/password_manager/encryptor_unittest.cc',
         'browser/password_manager/password_form_manager_unittest.cc',
+        'browser/password_manager/password_store_mac_unittest.cc',
         'browser/printing/page_number_unittest.cc',
         'browser/printing/page_overlays_unittest.cc',
         'browser/printing/page_range_unittest.cc',