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

chrome/browser/password_manager/native_backend_gnome_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_gnome_x.h"
 
 #include <dlfcn.h>
 #include <gnome-keyring.h>
 
 #include <map>
@@ skipping 398 matching lines @@
   method->forms_.clear();
   // |list| will be freed after this callback returns, so convert it now.
   ConvertFormList(list, &method->forms_);
   method->event_.Signal();
 }
 
 }  // namespace
 
 NativeBackendGnome::NativeBackendGnome(LocalProfileId id, PrefService* prefs)
     : profile_id_(id), prefs_(prefs) {
-  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)) {
     app_string_ = GetProfileSpecificAppString();
     // We already did the migration previously. Don't try again.
     migrate_tried_ = true;
   } else {
     app_string_ = kGnomeKeyringAppString;
     migrate_tried_ = false;
   }
 }
 
 NativeBackendGnome::~NativeBackendGnome() {
@@ skipping 298 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 app string.
     app_string_ = kGnomeKeyringAppString;
   }
 }