Two clients integration tests

chromium_src/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc

@@ -0,0 +1,3 @@
+#define SingleClientWalletSecondaryAccountSyncTest DISABLED_SingleClientWalletSecondaryAccountSyncTest
+#include "../../../../../../../chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc"
+#undef SingleClientWalletSecondaryAccountSyncTest

chromium_src/chrome/browser/sync/test/integration/two_client_custom_passphrase_sync_test.cc

@@ -0,0 +1,4 @@
+// We don't have one client with scrypt and another using PBKDF2
+#define TwoClientCustomPassphraseSyncTestScryptEnabledInPreTest DISABLED_TwoClientCustomPassphraseSyncTestScryptEnabledInPreTest
+#include "../../../../../../../chrome/browser/sync/test/integration/two_client_custom_passphrase_sync_test.cc"
+#undef TwoClientCustomPassphraseSyncTestScryptEnabledInPreTest

chromium_src/components/sync/driver/profile_sync_service.cc

@@ -24,10 +24,8 @@
   brave_sync_prefs_change_registrar_.RemoveAll();
 
 #include "../../../../../components/sync/driver/profile_sync_service.cc"
-#undef BRAVE_SET_POLL_INTERVAL
 #undef BRAVE_PROFILE_SYNC_SERVICE
 #undef BRAVE_D_PROFILE_SYNC_SERVICE
-#undef BRAVE_ON_FIRST_SETUP_COMPLETE_PREF_CHANGE
 
 namespace syncer {
 void ProfileSyncService::OnBraveSyncPrefsChanged(const std::string& path) {

patches/components-sync-driver-profile_sync_service.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/components/sync/driver/profile_sync_service.cc b/components/sync/driver/profile_sync_service.cc
-index 96abaa6e76e73d8896c31063a532b07a164ac9d0..1ed808e473a95ed6ffa37eae32d131bfee70169b 100644
+index 96abaa6e76e73d8896c31063a532b07a164ac9d0..5db4febb4441333282a462c3154f16ee62ce211b 100644
 --- a/components/sync/driver/profile_sync_service.cc
 +++ b/components/sync/driver/profile_sync_service.cc
 @@ -199,6 +199,7 @@ ProfileSyncService::ProfileSyncService(InitParams init_params)
@@ -27,3 +27,12 @@ index 96abaa6e76e73d8896c31063a532b07a164ac9d0..1ed808e473a95ed6ffa37eae32d131bf
    NotifyObservers();
  }
  
+@@ -1023,7 +1025,7 @@ void ProfileSyncService::OnActionableError(const SyncProtocolError& error) {
+       // that IsSyncRequested gets set to false, and Sync won't start again on
+       // the next browser startup.
+       StopAndClear();
+-#if !defined(OS_CHROMEOS)
++#if !defined(OS_CHROMEOS) && 0
+       // On every platform except ChromeOS, sign out the user after a dashboard
+       // clear.
+       if (!IsLocalSyncEnabled()) {

test/BUILD.gn

@@ -574,8 +574,29 @@ test("brave_browser_tests") {
     "//chrome/browser/sync/test/integration/single_client_themes_sync_test.cc",
     "//chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc",
     "//chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc",
+    "//chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc",
     "//chrome/browser/sync/test/integration/single_client_web_apps_sync_test.cc",
     "//chrome/browser/sync/test/integration/sync_auth_test.cc",
+    "//chrome/browser/sync/test/integration/sync_errors_test.cc",
+    "//chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_autocomplete_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_custom_passphrase_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_extension_apps_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_polling_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_send_tab_to_self_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_themes_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_user_events_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_wallet_sync_test.cc",
+    "//chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc",
   ]
 
   if (is_mac) {