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

chrome/browser/password_manager/native_backend_kwallet_x.cc

 // Copyright (c) 2011 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/native_backend_kwallet_x.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 21 matching lines @@
 const char NativeBackendKWallet::kKLauncherServiceName[] = "org.kde.klauncher";
 const char NativeBackendKWallet::kKLauncherPath[] = "/KLauncher";
 const char NativeBackendKWallet::kKLauncherInterface[] = "org.kde.KLauncher";
 
 NativeBackendKWallet::NativeBackendKWallet(LocalProfileId id,
                                            PrefService* prefs)
     : profile_id_(id),
       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;
   } else {
     folder_name_ = kKWalletFolder;
     migrate_tried_ = false;
   }
 }
 
 NativeBackendKWallet::~NativeBackendKWallet() {
@@ skipping 834 matching lines @@
     // Each other profile must be able to migrate the shared data as well,
     // so we must leave it alone. After a few releases, we'll add code to
     // delete them, and eventually remove this migration code.
     // TODO(mdm): follow through with the plan above.
     PasswordStoreX::SetPasswordsUseLocalProfileId(prefs_);
   } else {
     // We failed to migrate for some reason. Use the old folder name.
     folder_name_ = kKWalletFolder;
   }
 }