From ea653acd4ec1b2d6808abd2f3bfbb2bb01cb5d2f Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 3 Apr 2026 11:38:06 +0100 Subject: [PATCH] [cr148] `SetInitialSyncFeatureSetupComplete` dropped unused arg Chromium changes: https://chromium.googlesource.com/chromium/src/+/448b9a0247edbe13101ad734f58b0e9792d6064b commit 448b9a0247edbe13101ad734f58b0e9792d6064b Author: Tanmoy Mollik Date: Thu Apr 2 05:25:50 2026 -0700 Remove unused method param in SyncUserSettings Bug: 347710361 Change-Id: Ie08884a8a8d4d37d1f6e8b91f2200f1d4d6bf948 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7715580 Commit-Queue: Tanmoy Mollik Reviewed-by: Marc Treib Cr-Commit-Position: refs/heads/main@{#1609128} --- browser/android/brave_sync_worker.cc | 3 +-- browser/ui/webui/settings/brave_sync_handler.cc | 3 +-- .../script_injector_render_frame_observer.cc | 2 +- .../service/brave_sync_service_impl_unittest.cc | 15 +++++---------- ios/browser/api/sync/brave_sync_worker.cc | 3 +-- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/browser/android/brave_sync_worker.cc b/browser/android/brave_sync_worker.cc index 321a2f3288b..953f4d65208 100644 --- a/browser/android/brave_sync_worker.cc +++ b/browser/android/brave_sync_worker.cc @@ -138,8 +138,7 @@ void BraveSyncWorker::MarkFirstSetupComplete() { // We're done configuring, so notify SyncService that it is OK to start // syncing. - service->GetUserSettings()->SetInitialSyncFeatureSetupComplete( - syncer::SyncFirstSetupCompleteSource::ADVANCED_FLOW_CONFIRM); + service->GetUserSettings()->SetInitialSyncFeatureSetupComplete(); } void BraveSyncWorker::FinalizeSyncSetup(JNIEnv* env) { diff --git a/browser/ui/webui/settings/brave_sync_handler.cc b/browser/ui/webui/settings/brave_sync_handler.cc index 2987cbde5c8..f171eadf0ef 100644 --- a/browser/ui/webui/settings/brave_sync_handler.cc +++ b/browser/ui/webui/settings/brave_sync_handler.cc @@ -294,8 +294,7 @@ void BraveSyncHandler::HandleSetSyncCode(const base::ListValue& args) { // we will set the result at BraveSyncHandler::OnJoinChainResult. // Otherwise we will not let to send request to the server. - sync_service->GetUserSettings()->SetInitialSyncFeatureSetupComplete( - syncer::SyncFirstSetupCompleteSource::ADVANCED_FLOW_CONFIRM); + sync_service->GetUserSettings()->SetInitialSyncFeatureSetupComplete(); } void BraveSyncHandler::OnJoinChainResult(base::Value callback_id, bool result) { diff --git a/components/script_injector/renderer/script_injector_render_frame_observer.cc b/components/script_injector/renderer/script_injector_render_frame_observer.cc index b49a81196a5..cbc75ffbb57 100644 --- a/components/script_injector/renderer/script_injector_render_frame_observer.cc +++ b/components/script_injector/renderer/script_injector_render_frame_observer.cc @@ -52,7 +52,7 @@ void ScriptInjectorRenderFrameObserver::RequestAsyncExecuteScript( blink::mojom::PromiseResultOption await_promise, RequestAsyncExecuteScriptCallback callback) { blink::WebScriptSource web_script_source = - blink::WebScriptSource(blink::WebString::FromUTF16(script)); + blink::WebScriptSource(blink::WebString::FromUtf16(script)); auto want_result = CheckIfWantResult(callback); diff --git a/components/sync/service/brave_sync_service_impl_unittest.cc b/components/sync/service/brave_sync_service_impl_unittest.cc index 8c897067f4c..00970009cb5 100644 --- a/components/sync/service/brave_sync_service_impl_unittest.cc +++ b/components/sync/service/brave_sync_service_impl_unittest.cc @@ -321,8 +321,7 @@ TEST_F(BraveSyncServiceImplTest, ForcedSetDecryptionPassphrase) { brave_sync_service_impl() ->GetUserSettings() - ->SetInitialSyncFeatureSetupComplete( - syncer::SyncFirstSetupCompleteSource::ADVANCED_FLOW_CONFIRM); + ->SetInitialSyncFeatureSetupComplete(); // Pretend we need the passphrase by triggering OnPassphraseRequired and // supplying the encrypted portion of data, as it is done in @@ -422,8 +421,7 @@ TEST_F(BraveSyncServiceImplTest, PermanentlyDeleteAccount) { brave_sync_service_impl() ->GetUserSettings() - ->SetInitialSyncFeatureSetupComplete( - syncer::SyncFirstSetupCompleteSource::ADVANCED_FLOW_CONFIRM); + ->SetInitialSyncFeatureSetupComplete(); EXPECT_TRUE(engine()); std::unique_ptr> mock_sync_engine = @@ -552,8 +550,7 @@ TEST_F(BraveSyncServiceImplTest, HistoryPreconditions) { brave_sync_service_impl() ->GetUserSettings() - ->SetInitialSyncFeatureSetupComplete( - syncer::SyncFirstSetupCompleteSource::ADVANCED_FLOW_CONFIRM); + ->SetInitialSyncFeatureSetupComplete(); EXPECT_TRUE(engine()); // Code below turns on encrypt everything @@ -599,8 +596,7 @@ TEST_F(BraveSyncServiceImplTest, BookmarksAndPasswordsAfterSetup) { brave_sync_service_impl() ->GetUserSettings() - ->SetInitialSyncFeatureSetupComplete( - syncer::SyncFirstSetupCompleteSource::ADVANCED_FLOW_CONFIRM); + ->SetInitialSyncFeatureSetupComplete(); EXPECT_TRUE(engine()); EXPECT_FALSE( @@ -719,8 +715,7 @@ TEST_F(BraveSyncServiceImplTest_DisableSyncDefaultPasswordsTest, brave_sync_service_impl() ->GetUserSettings() - ->SetInitialSyncFeatureSetupComplete( - syncer::SyncFirstSetupCompleteSource::ADVANCED_FLOW_CONFIRM); + ->SetInitialSyncFeatureSetupComplete(); EXPECT_TRUE(engine()); EXPECT_FALSE( diff --git a/ios/browser/api/sync/brave_sync_worker.cc b/ios/browser/api/sync/brave_sync_worker.cc index 6db81fa70f4..a8c5a3a4ae0 100644 --- a/ios/browser/api/sync/brave_sync_worker.cc +++ b/ios/browser/api/sync/brave_sync_worker.cc @@ -287,8 +287,7 @@ bool BraveSyncWorker::SetSetupComplete() { } if (!sync_service->GetUserSettings()->IsInitialSyncFeatureSetupComplete()) { - sync_service->GetUserSettings()->SetInitialSyncFeatureSetupComplete( - syncer::SyncFirstSetupCompleteSource::ADVANCED_FLOW_CONFIRM); + sync_service->GetUserSettings()->SetInitialSyncFeatureSetupComplete(); } return true;