Revert of Forward password-store switch to OSCrypt component

components/os_crypt/key_storage_linux.cc

Index: components/os_crypt/key_storage_linux.cc
diff --git a/components/os_crypt/key_storage_linux.cc b/components/os_crypt/key_storage_linux.cc
index e54bb9e6719f89d22e763eb8a0aa0b70afa4c2c4..c243a129808d6c8cd850189962ce20d1bfabae07 100644
--- a/components/os_crypt/key_storage_linux.cc
+++ b/components/os_crypt/key_storage_linux.cc
@@ -4,56 +4,14 @@
 
 #include "components/os_crypt/key_storage_linux.h"
 
-#include <string.h>
-
-#include "base/environment.h"
-#include "base/lazy_instance.h"
-#include "base/logging.h"
-#include "base/nix/xdg_util.h"
-
-#if defined(USE_LIBSECRET)
 #include "components/os_crypt/key_storage_libsecret.h"
-#endif
-
-base::LazyInstance<std::string> g_store_ = LAZY_INSTANCE_INITIALIZER;
-
-// static
-void KeyStorageLinux::SetStore(const std::string& store_type) {
-  g_store_.Get() = store_type;
-  VLOG(1) << "OSCrypt store set to " << store_type;
-}
 
 // static
 std::unique_ptr<KeyStorageLinux> KeyStorageLinux::CreateService() {
-  base::nix::DesktopEnvironment used_desktop_env;
-  if (g_store_.Get() == "kwallet") {
-    used_desktop_env = base::nix::DESKTOP_ENVIRONMENT_KDE4;
-  } else if (g_store_.Get() == "kwallet5") {
-    used_desktop_env = base::nix::DESKTOP_ENVIRONMENT_KDE5;
-  } else if (g_store_.Get() == "gnome") {
-    used_desktop_env = base::nix::DESKTOP_ENVIRONMENT_GNOME;
-  } else if (g_store_.Get() == "basic") {
-    used_desktop_env = base::nix::DESKTOP_ENVIRONMENT_OTHER;
-  } else {
-    std::unique_ptr<base::Environment> env(base::Environment::Create());
-    used_desktop_env = base::nix::GetDesktopEnvironment(env.get());
-  }
+  std::unique_ptr<KeyStorageLinux> key_storage(new KeyStorageLibsecret());
 
-  // Try initializing the appropriate store for our environment.
-  std::unique_ptr<KeyStorageLinux> key_storage;
-  if (used_desktop_env == base::nix::DESKTOP_ENVIRONMENT_GNOME ||
-      used_desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY ||
-      used_desktop_env == base::nix::DESKTOP_ENVIRONMENT_XFCE) {
-#if defined(USE_LIBSECRET)
-    key_storage.reset(new KeyStorageLibsecret());
-    if (key_storage->Init()) {
-      VLOG(1) << "OSCrypt using Libsecret as backend.";
-      return key_storage;
-    }
-#endif
-  }
+  if (key_storage->Init())
+    return key_storage;
 
-  // The appropriate store was not available.
-  VLOG(1) << "OSCrypt could not initialize a backend.";
   return nullptr;
 }