From 6a842ca445257455cdca4080ebd74c44ae6f62a4 Mon Sep 17 00:00:00 2001 From: AlexeyBarabash Date: Mon, 8 Sep 2025 14:40:59 +0300 Subject: [PATCH] [cr142][Android] Chromium removed stuff around password manager - password_manager::RegisterLegacySplitStoresPref - password_manager::SetLegacySplitStoresPrefForTest - kUpmUnmigratedPasswordsExported - kEmptyProfileStoreLoginDatabase Chromium change: https://source.chromium.org/chromium/chromium/src/+/e4d18fe2cd562dd016dafc60cdfe18b1bf2488f2 [android/passwords] Stop compiling LoginDatabase (pt 1) Stops auto-exporting the LoginDatabase to a CSV in the Chrome app data folder. Existing CSVs are left untouched and the UI to move them to a different folder is still around. IsPasswordManagerAvailable() now only depends on GmsCore version and the presence of the internal backend. Removes: - kUpmUnmigratedPasswordsExported pref - kPasswordsUseUPMLocalAndSeparateStores pref - kEmptyProfileStoreLoginDatabase pref - LoginDbDeprecationRunner and friends OBSOLETE_HISTOGRAMS=The LoginDatabase auto-export was removed Bug: 378652343 Change-Id: I7c8cd9e9d0adf35643634b15ef375153aa11d444 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6859683 --- ..._password_manager_android_util_unittest.cc | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/browser/password_manager/android/brave_password_manager_android_util_unittest.cc b/browser/password_manager/android/brave_password_manager_android_util_unittest.cc index ccbc96c82dc..29aa8543464 100644 --- a/browser/password_manager/android/brave_password_manager_android_util_unittest.cc +++ b/browser/password_manager/android/brave_password_manager_android_util_unittest.cc @@ -12,6 +12,7 @@ #include "components/password_manager/core/browser/password_manager_buildflags.h" #include "components/password_manager/core/browser/password_manager_constants.h" #include "components/password_manager/core/browser/split_stores_and_local_upm.h" +#include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/testing_pref_service.h" #include "components/sync/base/data_type.h" @@ -24,12 +25,6 @@ namespace { class BravePasswordManagerAndroidUtilTest : public testing::Test { public: BravePasswordManagerAndroidUtilTest() { - password_manager::RegisterLegacySplitStoresPref(pref_service_.registry()); - - pref_service_.registry()->RegisterBooleanPref( - password_manager::prefs::kUpmUnmigratedPasswordsExported, false); - pref_service_.registry()->RegisterBooleanPref( - password_manager::prefs::kEmptyProfileStoreLoginDatabase, false); pref_service_.registry()->RegisterBooleanPref( password_manager::prefs::kCredentialsEnableService, false); pref_service_.registry()->RegisterBooleanPref( @@ -78,17 +73,6 @@ static_assert(BUILDFLAG(USE_LOGIN_DATABASE_AS_BACKEND)); // We don't want password db to be deleted on Android // Based on DeletesLoginDataFilesAfterUnmigratedPasswordsExported TEST_F(BravePasswordManagerAndroidUtilTest, DoNotDeleteLoginDataFiles) { - // Assume an unmigrated user. - password_manager::SetLegacySplitStoresPrefForTest(pref_service(), false); - // With unmigrated passwords exported. - pref_service()->SetBoolean( - password_manager::prefs::kUpmUnmigratedPasswordsExported, true); - - // And for whom the initial passwords deletion failed, so they still have - // passwords in the db. - pref_service()->SetBoolean( - password_manager::prefs::kEmptyProfileStoreLoginDatabase, false); - // Creating the login data files for testing. base::FilePath profile_db_path = login_db_directory().Append( password_manager::kLoginDataForProfileFileName); @@ -116,9 +100,6 @@ TEST_F(BravePasswordManagerAndroidUtilTest, DoNotDeleteLoginDataFiles) { EXPECT_TRUE(PathExists(account_db_path)); EXPECT_TRUE(PathExists(profile_db_journal_path)); EXPECT_TRUE(PathExists(account_db_journal_path)); - - EXPECT_FALSE(pref_service()->GetBoolean( - password_manager::prefs::kEmptyProfileStoreLoginDatabase)); } } // namespace