Fully re-enable sync_integration_tests on windows

Bug: 419089901
Change-Id: I0b19a6a0319b4eeca9e1c34f7c4841c8b46c2849
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6576480
Reviewed-by: Haiyang Pan <hypan@google.com>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1464205}

infra/config/generated/builders/ci/Win x64 Builder/targets/chromium.win.json

@@ -1436,7 +1436,6 @@
         "test_id_prefix": "ninja://storage:storage_unittests/"
       },
       {
-        "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -1453,6 +1452,26 @@
         "test": "sync_integration_tests",
         "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
       },
+      {
+        "args": [
+          "--disable-field-trial-config"
+        ],
+        "ci_only": true,
+        "isolate_profile_data": true,
+        "merge": {
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "sync_integration_tests_no_field_trial",
+        "swarming": {
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "sync_integration_tests",
+        "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
+      },
       {
         "isolate_profile_data": true,
         "merge": {
@@ -3449,6 +3468,23 @@
         "test": "storage_unittests",
         "test_id_prefix": "ninja://storage:storage_unittests/"
       },
+      {
+        "isolate_profile_data": true,
+        "merge": {
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "sync_integration_tests",
+        "swarming": {
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-11-22631"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 3
+        },
+        "test": "sync_integration_tests",
+        "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
+      },
       {
         "isolate_profile_data": true,
         "merge": {

infra/config/generated/builders/ci/Win10 Tests x64/targets/chromium.win.json

@@ -1412,7 +1412,6 @@
         "test_id_prefix": "ninja://storage:storage_unittests/"
       },
       {
-        "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -1429,6 +1428,26 @@
         "test": "sync_integration_tests",
         "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
       },
+      {
+        "args": [
+          "--disable-field-trial-config"
+        ],
+        "ci_only": true,
+        "isolate_profile_data": true,
+        "merge": {
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "sync_integration_tests_no_field_trial",
+        "swarming": {
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "sync_integration_tests",
+        "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
+      },
       {
         "isolate_profile_data": true,
         "merge": {

infra/config/generated/builders/ci/Win11 Tests x64/targets/chromium.win.json

@@ -1271,6 +1271,23 @@
         "test": "storage_unittests",
         "test_id_prefix": "ninja://storage:storage_unittests/"
       },
+      {
+        "isolate_profile_data": true,
+        "merge": {
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "sync_integration_tests",
+        "swarming": {
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-11-22631"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 3
+        },
+        "test": "sync_integration_tests",
+        "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
+      },
       {
         "isolate_profile_data": true,
         "merge": {

infra/config/generated/builders/try/win-rel/targets/chromium.win.json

@@ -1436,7 +1436,6 @@
         "test_id_prefix": "ninja://storage:storage_unittests/"
       },
       {
-        "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -1453,6 +1452,26 @@
         "test": "sync_integration_tests",
         "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
       },
+      {
+        "args": [
+          "--disable-field-trial-config"
+        ],
+        "ci_only": true,
+        "isolate_profile_data": true,
+        "merge": {
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "sync_integration_tests_no_field_trial",
+        "swarming": {
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-10-19045"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "sync_integration_tests",
+        "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
+      },
       {
         "isolate_profile_data": true,
         "merge": {

infra/config/generated/builders/try/win11-rel/targets/chromium.win.json

@@ -1295,6 +1295,23 @@
         "test": "storage_unittests",
         "test_id_prefix": "ninja://storage:storage_unittests/"
       },
+      {
+        "isolate_profile_data": true,
+        "merge": {
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "sync_integration_tests",
+        "swarming": {
+          "dimensions": {
+            "cpu": "x86-64",
+            "os": "Windows-11-22631"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 3
+        },
+        "test": "sync_integration_tests",
+        "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
+      },
       {
         "isolate_profile_data": true,
         "merge": {

infra/config/subprojects/chromium/ci/chromium.win.star

@@ -462,14 +462,10 @@ ci.builder(
                 ),
             ),
             "sync_integration_tests": targets.mixin(
-                ci_only = True,
                 swarming = targets.swarming(
                     shards = 3,
                 ),
             ),
-            "sync_integration_tests_no_field_trial": targets.remove(
-                reason = "Having infra failure (crbug.com/419179070)",
-            ),
             "telemetry_perf_unittests": targets.remove(
                 reason = "Some test cases fail on win-rel (crbug/40622135).",
             ),
@@ -602,9 +598,6 @@ ci.thin_tester(
                     "Win10), we also need to update this field.",
                 ],
             ),
-            "sync_integration_tests": targets.remove(
-                reason = "Having infra failure (crbug.com/419179070)",
-            ),
             "sync_integration_tests_no_field_trial": targets.remove(
                 reason = "crbug/40630866",
             ),