Fixes password import from Chrome on Linux.

Passwords are no longer stored using native backend. Switch to importing
from LoginDatabase like on other platforms.

Chromium change:

commit 6811de35a39128fb354f238bce350f9a4a643e9d
Author: Mohamed Amir Yosef <mamir@chromium.org>
Date:   Thu Jul 25 22:26:26 2019 +0000

    [PasswordManager] Stop Using Native Backends on Linux systems

    Recent migrations moved all users who have been using the keying to the
    LoginDatabase. This CL forces all users to using LoginDatabase
    instead of native backends on Linux.

    TBR=pcc@chromium.org

    Change-Id: Ibac11e68d8f354ecf7f3c9828d95777ea5b3df60
    Bug: 950269, 950267

utility/BUILD.gn

@@ -35,6 +35,9 @@ source_set("utility") {
     ]
 
     deps += [
+      "//base",
+      "//chrome/app:chromium_strings",
+      "//components/os_crypt",
       "//components/password_manager/core/browser",
     ]
   }
@@ -50,10 +53,4 @@ source_set("utility") {
   if (brave_rewards_enabled) {
     deps += [ "//brave/components/services/bat_ledger:lib" ]
   }
-
-  defines = []
-  if (use_glib) {
-    defines += [ "USE_LIBSECRET" ]
-    deps += [ "//third_party/libsecret" ]
-  }
 }

utility/importer/brave_importer.cc

@@ -39,19 +39,6 @@
 #include "sql/statement.h"
 #include "url/gurl.h"
 
-#if defined(OS_LINUX)
-#include "components/os_crypt/key_storage_config_linux.h"
-#endif
-
-#if defined(USE_X11)
-#if defined(USE_LIBSECRET)
-#include "chrome/browser/password_manager/native_backend_libsecret.h"
-#endif
-#include "chrome/browser/password_manager/native_backend_kwallet_x.h"
-#include "chrome/browser/password_manager/password_store_x.h"
-#include "components/os_crypt/key_storage_util_linux.h"
-#endif
-
 using base::Time;
 
 BraveImporter::BraveImporter() {

utility/importer/chrome_importer.cc

@@ -39,21 +39,9 @@
 
 #if defined(OS_LINUX)
 #include "components/os_crypt/key_storage_config_linux.h"
-#endif
-
-#if defined(USE_X11)
-#if defined(USE_LIBSECRET)
-#include "chrome/browser/password_manager/native_backend_libsecret.h"
-#endif
-#include "chrome/browser/password_manager/native_backend_kwallet_x.h"
-#include "chrome/browser/password_manager/password_store_x.h"
-#include "components/os_crypt/key_storage_util_linux.h"
-
-base::nix::DesktopEnvironment ChromeImporter::GetDesktopEnvironment() {
-  std::unique_ptr<base::Environment> env(base::Environment::Create());
-  return base::nix::GetDesktopEnvironment(env.get());
-}
-#endif
+#include "chrome/grit/chromium_strings.h"
+#include "ui/base/l10n/l10n_util.h"
+#endif  // defined(OS_LINUX)
 
 using base::Time;
 
@@ -314,92 +302,37 @@ double ChromeImporter::chromeTimeToDouble(int64_t time) {
 }
 
 void ChromeImporter::ImportPasswords(const base::FilePath& prefs_filename) {
-  #if !defined(USE_X11)
-    base::FilePath passwords_path =
-      source_path_.Append(
-        base::FilePath::StringType(FILE_PATH_LITERAL("Login Data")));
-
-    password_manager::LoginDatabase database(passwords_path);
-    if (!database.Init()) {
-      LOG(ERROR) << "LoginDatabase Init() failed";
-      return;
-    }
+#if defined(OS_LINUX)
+  // Set up crypt config.
+  std::unique_ptr<os_crypt::Config> config(new os_crypt::Config());
+  config->product_name = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME);
+  config->should_use_preference = false;
+  config->user_data_path = source_path_;
+  OSCrypt::SetConfig(std::move(config));
+#endif
+  base::FilePath passwords_path = source_path_.Append(
+      base::FilePath::StringType(FILE_PATH_LITERAL("Login Data")));
 
-    std::vector<std::unique_ptr<autofill::PasswordForm>> forms;
-    bool success = database.GetAutofillableLogins(&forms);
-    if (success) {
-      for (size_t i = 0; i < forms.size(); ++i) {
-        bridge_->SetPasswordForm(*forms[i].get());
-      }
-    }
-    std::vector<std::unique_ptr<autofill::PasswordForm>> blacklist;
-    success = database.GetBlacklistLogins(&blacklist);
-    if (success) {
-      for (size_t i = 0; i < blacklist.size(); ++i) {
-        bridge_->SetPasswordForm(*blacklist[i].get());
-      }
-    }
-  #else
-    base::FilePath prefs_path = source_path_.Append(prefs_filename);
-    const base::Value *value;
-    scoped_refptr<JsonPrefStore> prefs = new JsonPrefStore(prefs_path);
-    int local_profile_id;
-    if (prefs->ReadPrefs() != PersistentPrefStore::PREF_READ_ERROR_NONE) {
-      return;
-    }
-    if (!prefs->GetValue(password_manager::prefs::kLocalProfileId, &value)) {
-      return;
-    }
-    if (!value->GetAsInteger(&local_profile_id)) {
-      return;
-    }
+  password_manager::LoginDatabase database(passwords_path);
+  if (!database.Init()) {
+    LOG(ERROR) << "LoginDatabase Init() failed";
+    return;
+  }
 
-    std::unique_ptr<PasswordStoreX::NativeBackend> backend;
-    base::nix::DesktopEnvironment desktop_env = GetDesktopEnvironment();
-
-    // WIP proper kEnableEncryptionSelection
-    os_crypt::SelectedLinuxBackend selected_backend =
-        os_crypt::SelectBackend(std::string(), true, desktop_env);
-    if (!backend &&
-        (selected_backend == os_crypt::SelectedLinuxBackend::KWALLET ||
-        selected_backend == os_crypt::SelectedLinuxBackend::KWALLET5)) {
-      base::nix::DesktopEnvironment used_desktop_env =
-          selected_backend == os_crypt::SelectedLinuxBackend::KWALLET
-              ? base::nix::DESKTOP_ENVIRONMENT_KDE4
-              : base::nix::DESKTOP_ENVIRONMENT_KDE5;
-      backend.reset(new NativeBackendKWallet(local_profile_id,
-                                             used_desktop_env));
-    } else if (selected_backend == os_crypt::SelectedLinuxBackend::GNOME_ANY ||
-               selected_backend ==
-                   os_crypt::SelectedLinuxBackend::GNOME_KEYRING ||
-               selected_backend ==
-                   os_crypt::SelectedLinuxBackend::GNOME_LIBSECRET) {
-  #if defined(USE_LIBSECRET)
-      if (!backend &&
-          (selected_backend == os_crypt::SelectedLinuxBackend::GNOME_ANY ||
-           selected_backend ==
-               os_crypt::SelectedLinuxBackend::GNOME_LIBSECRET)) {
-        backend.reset(new NativeBackendLibsecret(local_profile_id));
-      }
-  #endif
+  std::vector<std::unique_ptr<autofill::PasswordForm>> forms;
+  bool success = database.GetAutofillableLogins(&forms);
+  if (success) {
+    for (size_t i = 0; i < forms.size(); ++i) {
+      bridge_->SetPasswordForm(*forms[i].get());
     }
-    if (backend && backend->Init()) {
-      std::vector<std::unique_ptr<autofill::PasswordForm>> forms;
-      bool success = backend->GetAutofillableLogins(&forms);
-      if (success) {
-        for (size_t i = 0; i < forms.size(); ++i) {
-          bridge_->SetPasswordForm(*forms[i].get());
-        }
-      }
-      std::vector<std::unique_ptr<autofill::PasswordForm>> blacklist;
-      success = backend->GetBlacklistLogins(&blacklist);
-      if (success) {
-        for (size_t i = 0; i < blacklist.size(); ++i) {
-          bridge_->SetPasswordForm(*blacklist[i].get());
-        }
-      }
+  }
+  std::vector<std::unique_ptr<autofill::PasswordForm>> blacklist;
+  success = database.GetBlacklistLogins(&blacklist);
+  if (success) {
+    for (size_t i = 0; i < blacklist.size(); ++i) {
+      bridge_->SetPasswordForm(*blacklist[i].get());
     }
-  #endif
+  }
 }
 
 void ChromeImporter::ImportCookies() {