diff options
| author | dvadym <dvadym@chromium.org> | 2015-11-03 10:26:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-03 18:27:49 +0000 |
| commit | 1fb6fb8ae71b3ebfa0f28b1be6b6dc9f59640dea (patch) | |
| tree | 41c11e9ee0d98cb2865af27e7eb4980e9a660f3c | |
| parent | 3bf4c3c36d1d2fa3a477287b66a0c559ed1ddfa7 (diff) | |
| download | chromium_src-1fb6fb8ae71b3ebfa0f28b1be6b6dc9f59640dea.zip chromium_src-1fb6fb8ae71b3ebfa0f28b1be6b6dc9f59640dea.tar.gz chromium_src-1fb6fb8ae71b3ebfa0f28b1be6b6dc9f59640dea.tar.bz2 | |
Libsecret kill switch is removed
Libsecret password backend is from M-42, current dev is M-48, so I think we can remove kill switch. This is CL with adding this kill switch https://codereview.chromium.org/851053003
BUG=450225
Review URL: https://codereview.chromium.org/1414883008
Cr-Commit-Position: refs/heads/master@{#357566}
| -rw-r--r-- | chrome/browser/password_manager/password_store_factory.cc | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc index 3b9ea6d..f4873fe 100644 --- a/chrome/browser/password_manager/password_store_factory.cc +++ b/chrome/browser/password_manager/password_store_factory.cc @@ -45,7 +45,6 @@ #include "chrome/browser/password_manager/native_backend_gnome_x.h" #endif #if defined(USE_LIBSECRET) -#include "base/metrics/field_trial.h" #include "chrome/browser/password_manager/native_backend_libsecret.h" #endif #include "chrome/browser/password_manager/native_backend_kwallet_x.h" @@ -61,11 +60,6 @@ const LocalProfileId kInvalidLocalProfileId = static_cast<LocalProfileId>(0); #endif -#if defined(USE_LIBSECRET) -const char kLibsecretFieldTrialName[] = "Libsecret"; -const char kLibsecretFieldTrialDisabledGroupName[] = "Disabled"; -#endif - } // namespace // static @@ -224,16 +218,13 @@ KeyedService* PasswordStoreFactory::BuildServiceInstanceFor( used_desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY || used_desktop_env == base::nix::DESKTOP_ENVIRONMENT_XFCE) { #if defined(USE_LIBSECRET) - if (base::FieldTrialList::FindFullName(kLibsecretFieldTrialName) != - kLibsecretFieldTrialDisabledGroupName) { - VLOG(1) << "Trying libsecret for password storage."; - backend.reset(new NativeBackendLibsecret(id)); - if (backend->Init()) { - VLOG(1) << "Using libsecret keyring for password storage."; - used_backend = LIBSECRET; - } else { - backend.reset(); - } + VLOG(1) << "Trying libsecret for password storage."; + backend.reset(new NativeBackendLibsecret(id)); + if (backend->Init()) { + VLOG(1) << "Using libsecret keyring for password storage."; + used_backend = LIBSECRET; + } else { + backend.reset(); } #endif // defined(USE_LIBSECRET) if (!backend.get()) { |