Fixed issue of unable to switch on the passwords sync on Android (uplift to 1.73.x) (#26919)

Uplift of #26876 (squashed) to release

Author: brave-builds

chromium_src/components/sync/service/sync_prefs.cc

@@ -0,0 +1,18 @@
+/* Copyright (c) 2024 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#include "components/sync/service/sync_prefs.h"
+
+#define SetPasswordSyncAllowed SetPasswordSyncAllowed_ChromiumImpl
+
+#include "src/components/sync/service/sync_prefs.cc"
+
+#undef SetPasswordSyncAllowed
+
+namespace syncer {
+
+void SyncPrefs::SetPasswordSyncAllowed(bool allowed) {}
+
+}  // namespace syncer

chromium_src/components/sync/service/sync_prefs.h

@@ -0,0 +1,19 @@
+/* Copyright (c) 2024 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_SERVICE_SYNC_PREFS_H_
+#define BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_SERVICE_SYNC_PREFS_H_
+
+void SetPasswordSyncAllowed(bool allowed);
+
+#define SetPasswordSyncAllowed                       \
+  SetPasswordSyncAllowed_ChromiumImpl(bool allowed); \
+  void SetPasswordSyncAllowed
+
+#include "src/components/sync/service/sync_prefs.h"  // IWYU pragma: export
+
+#undef SetPasswordSyncAllowed
+
+#endif  // BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_SERVICE_SYNC_PREFS_H_

components/brave_sync/BUILD.gn

@@ -157,5 +157,6 @@ source_set("unit_tests") {
     "//components/os_crypt/sync:test_support",
     "//components/prefs:test_support",
     "//components/sync/base",
+    "//components/sync/service",
   ]
 }

components/brave_sync/brave_sync_prefs_unittest.cc

@@ -17,6 +17,10 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if BUILDFLAG(IS_ANDROID)
+#include "components/sync/service/sync_prefs.h"
+#endif
+
 namespace brave_sync {
 
 namespace {
@@ -33,6 +37,10 @@ class BraveSyncPrefsTest : public testing::Test {
   BraveSyncPrefsTest() {
     brave_sync::Prefs::RegisterProfilePrefs(pref_service_.registry());
     brave_sync_prefs_ = std::make_unique<brave_sync::Prefs>(&pref_service_);
+#if BUILDFLAG(IS_ANDROID)
+    syncer::SyncPrefs::RegisterProfilePrefs(pref_service_.registry());
+    sync_prefs_ = std::make_unique<syncer::SyncPrefs>(&pref_service_);
+#endif
   }
 
   brave_sync::Prefs* brave_sync_prefs() { return brave_sync_prefs_.get(); }
@@ -42,6 +50,10 @@ class BraveSyncPrefsTest : public testing::Test {
   base::test::SingleThreadTaskEnvironment task_environment_;
   TestingPrefServiceSimple pref_service_;
   std::unique_ptr<brave_sync::Prefs> brave_sync_prefs_;
+
+#if BUILDFLAG(IS_ANDROID)
+  std::unique_ptr<syncer::SyncPrefs> sync_prefs_;
+#endif
 };
 
 #if BUILDFLAG(IS_APPLE)
@@ -127,4 +139,24 @@ TEST_F(BraveSyncPrefsTest, LeaveChainDetailsMaxLenIOS) {
   EXPECT_EQ(details.size(), max_len);
 }
 
+#if BUILDFLAG(IS_ANDROID)
+// This test is a modified upstream's
+// SyncPrefsTest.PasswordSyncAllowed_ExplicitValue
+TEST_F(BraveSyncPrefsTest, PasswordSyncAllowedExplicitValue) {
+  using syncer::UserSelectableType;
+  using syncer::UserSelectableTypeSet;
+
+  // Make passwords explicitly enabled (no default value).
+  sync_prefs_->SetSelectedTypesForSyncingUser(
+      /*keep_everything_synced=*/false,
+      /*registered_types=*/UserSelectableTypeSet::All(),
+      /*selected_types=*/{UserSelectableType::kPasswords});
+
+  sync_prefs_->SetPasswordSyncAllowed(false);
+
+  EXPECT_TRUE(sync_prefs_->GetSelectedTypesForSyncingUser().Has(
+      UserSelectableType::kPasswords));
+}
+#endif
+
 }  // namespace brave_sync