Always perform repeated field rationalisation

Currently, repeated field is performed when the server response arrives
[1], but not as part of DetermineHeuristicTypes(). As discussed offline,
let's perform repeated field rationalisation in both cases.

[1] https://source.chromium.org/chromium/chromium/src/+/main:components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_encoding.cc;l=836;drc=89f7acaf322ac2528ef7341f9a39473ae8599ce0

Bug: 320965828
Change-Id: I59b946a4e74330b0abb76da3e7ccf9dacb23ebdd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5992803


Commit-Queue: Florian Leimgruber <fleimgruber@google.com>
Reviewed-by: Dominic Battré <battre@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1378970}

DEPS

@@ -4386,7 +4386,7 @@ deps = {
 
   'src/components/test/data/autofill/heuristics-json/internal': {
       'url': Var('chrome_git') + '/chrome/test/autofill/structured_forms.git' + '@' +
-        '6b564d8d9c2175b5dc476ed5526f0860c512ff62',
+        '482fcb02e341795240ec419db144ce4f344c1160',
       'condition': 'checkout_chromium_autofill_test_dependencies',
   },
 

components/autofill/core/browser/form_structure.cc

@@ -226,17 +226,8 @@ void FormStructure::DetermineHeuristicTypes(
 
   UpdateAutofillCount();
   AssignSections(fields_);
-
-  FormStructureRationalizer rationalizer(&fields_);
-  rationalizer.RationalizeContentEditables(log_manager);
-  rationalizer.RationalizeAutocompleteAttributes(log_manager);
-  if (base::FeatureList::IsEnabled(features::kAutofillPageLanguageDetection)) {
-    rationalizer.RationalizeRepeatedFields(
-        form_signature_, form_interactions_ukm_logger, log_manager);
-  }
-  rationalizer.RationalizeFieldTypePredictions(
-      main_frame_origin_, client_country_, current_page_language_, log_manager);
-  rationalizer.RationalizePhoneNumbersForFilling();
+  RationalizeFormStructure(form_interactions_ukm_logger, log_manager);
+  RationalizePhoneNumberFieldsForFilling();
 
   // Log the field type predicted by rationalization.
   // The sections are mapped to consecutive natural numbers starting at 1.

internal @ 482fcb02

-Subproject commit 6b564d8d9c2175b5dc476ed5526f0860c512ff62
+Subproject commit 482fcb02e341795240ec419db144ce4f344c1160