From cff097d5d3109e1b32147ae578ee7691b57efb1d Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Tue, 28 Apr 2026 10:17:32 -0400 Subject: [PATCH] [cr149][Android] Changes for removed isInitialSyncFeatureSetupComplete() Chromium changes: https://chromium.googlesource.com/chromium/src/+/d78abe4e930bc802ef45f8a9a1c5ca2919e6b4bd commit d78abe4e930bc802ef45f8a9a1c5ca2919e6b4bd Author: Victor Hugo Vianna Silva Date: Mon Apr 20 05:59:44 2026 -0700 [sync/android] Remove isInitialSyncFeatureSetupComplete() Along with the corresponding setter and UserActionableError:: {kNeedsSettingsConfirmation,kUnrecoverableError}, which are unreachable in production code. OBSOLETE_HISTOGRAMS=Sync setup incomplete and unrecoverable error states were removed on Android, along with their histograms. NO_IFTTT=UserActionableError values are not obsoleted on all platforms. Bug: 40066949 Change-Id: I903ee43392dfe960e359404338d7d3f07873f784 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7772435 Reviewed-by: Marc Treib Commit-Queue: Victor Vianna Cr-Commit-Position: refs/heads/main@{#1617442} --- .../password_store_built_in_backend.cc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/chromium_src/components/password_manager/core/browser/password_store/password_store_built_in_backend.cc b/chromium_src/components/password_manager/core/browser/password_store/password_store_built_in_backend.cc index 315887e178e..935e559fe6d 100644 --- a/chromium_src/components/password_manager/core/browser/password_store/password_store_built_in_backend.cc +++ b/chromium_src/components/password_manager/core/browser/password_store/password_store_built_in_backend.cc @@ -7,6 +7,19 @@ #if BUILDFLAG(IS_ANDROID) +// Upstream cr149 +// (https://chromium-review.googlesource.com/c/chromium/src/+/7772435) removed +// `kNeedsSettingsConfirmation` and `kUnrecoverableError` from +// `syncer::SyncService::UserActionableError` on Android. Upstream Android +// uses the GMS-backed password manager and doesn't compile this file. +// Brave-Android sets `use_login_database_as_backend = true` and does compile +// it. Here we move these values back for Android to avoid build errors. +#define kNeedsUPMBackendUpgrade \ + kNeedsSettingsConfirmation = 7, kUnrecoverableError = 8, \ + kNeedsUPMBackendUpgrade +#include "components/sync/service/sync_service.h" +#undef kNeedsUPMBackendUpgrade + // Without this override there are error on Android cr130 build: // password_store_built_in_backend.cc:217:36: error: use of undeclared // identifier 'features'; did you mean 'sql::features'?