Linux: refactor GNOME Keyring and KWallet integration to allow migration from the default store, and add unit tests. Still disabled.

BUG=12351, 25404
TEST=unit tests work
Review URL: http://codereview.chromium.org/2806002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50034 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 24 deletions

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index f297108..0e0ad22 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1805,17 +1805,21 @@
         'browser/parsers/metadata_parser_manager.cc',
         'browser/parsers/metadata_parser_manager.h',
         'browser/parsers/metadata_parser.cc',
+        'browser/password_manager/encryptor.h',
         'browser/password_manager/encryptor_linux.cc',
         'browser/password_manager/encryptor_mac.mm',
         'browser/password_manager/encryptor_win.cc',
-        'browser/password_manager/encryptor.h',
         'browser/password_manager/ie7_password.cc',
         'browser/password_manager/ie7_password.h',
+        'browser/password_manager/login_database.cc',
+        'browser/password_manager/login_database.h',
         'browser/password_manager/login_database_mac.cc',
         'browser/password_manager/login_database_posix.cc',
         'browser/password_manager/login_database_win.cc',
-        'browser/password_manager/login_database.cc',
-        'browser/password_manager/login_database.h',
+        'browser/password_manager/native_backend_gnome_x.cc',
+        'browser/password_manager/native_backend_gnome_x.h',
+        'browser/password_manager/native_backend_kwallet_x.cc',
+        'browser/password_manager/native_backend_kwallet_x.h',
         'browser/password_manager/password_form_manager.cc',
         'browser/password_manager/password_form_manager.h',
         'browser/password_manager/password_manager.cc',
@@ -1824,15 +1828,13 @@
         'browser/password_manager/password_store.h',
         'browser/password_manager/password_store_default.cc',
         'browser/password_manager/password_store_default.h',
-        '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_mac.h',
+        'browser/password_manager/password_store_mac_internal.h',
         'browser/password_manager/password_store_win.cc',
+        'browser/password_manager/password_store_win.h',
+        'browser/password_manager/password_store_x.cc',
+        'browser/password_manager/password_store_x.h',
         'browser/platform_util.h',
         'browser/platform_util_linux.cc',
         'browser/platform_util_chromeos.cc',
@@ -2686,10 +2688,10 @@
         }],
         ['chromeos==1', {
           'sources!': [
-            '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/native_backend_gnome.h',
+            'browser/password_manager/native_backend_gnome.cc',
+            'browser/password_manager/native_backend_kwallet.h',
+            'browser/password_manager/native_backend_kwallet.cc',
             'browser/platform_util_linux.cc',
           ],
           'link_settings': {
@@ -2782,12 +2784,6 @@
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
             'browser/jankometer.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/renderer_host/backing_store_proxy.cc',
             'browser/renderer_host/backing_store_proxy.h',
             'browser/renderer_host/gpu_view_host.cc',
@@ -2960,10 +2956,6 @@
             'browser/history/history_publisher_none.cc',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
-            '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/power_save_blocker_stub.cc',
             'browser/views/select_file_dialog.cc',
           ],