Linux: stop migrating old, shared passwords into the profile-specific password scheme.

chrome/browser/password_manager/native_backend_kwallet_x.cc

Index: chrome/browser/password_manager/native_backend_kwallet_x.cc
===================================================================
--- chrome/browser/password_manager/native_backend_kwallet_x.cc	(revision 117092)
+++ chrome/browser/password_manager/native_backend_kwallet_x.cc	(working copy)
@@ -39,7 +39,10 @@
       prefs_(prefs),
       kwallet_proxy_(NULL),
       app_name_(l10n_util::GetStringUTF8(IDS_PRODUCT_NAME)) {
-  if (PasswordStoreX::PasswordsUseLocalProfileId(prefs)) {
+  // TODO(mdm): after a few more releases, remove the code which is now dead due
+  // to the true || here, and simplify this code. We don't do it yet to make it
+  // easier to revert if necessary.
+  if (true || PasswordStoreX::PasswordsUseLocalProfileId(prefs)) {
     folder_name_ = GetProfileSpecificFolderName();
     // We already did the migration previously. Don't try again.
     migrate_tried_ = true;