[Autofill] Disambiguate similar types before uploading.

components/autofill/core/browser/autofill_manager.h

Index: components/autofill/core/browser/autofill_manager.h
diff --git a/components/autofill/core/browser/autofill_manager.h b/components/autofill/core/browser/autofill_manager.h
index b14aad2bb477d24cba6efd7b38e1ced7289d11ce..a859e2ff36f4c268f80e7e7c18ac3a175517de37 100644
--- a/components/autofill/core/browser/autofill_manager.h
+++ b/components/autofill/core/browser/autofill_manager.h
@@ -416,6 +416,24 @@ class AutofillManager : public AutofillDownloadManager::Observer,
       const std::string& app_locale,
       FormStructure* submitted_form);
 
+  // Uses context about previous and next fields to select the appropriate type
+  // for fields with ambiguous upload types.
+  static void DisambiguateUploadTypes(FormStructure* form);
+
+  // Disambiguates address field upload types.
+  static void DisambiguateAddressUploadTypes(FormStructure* form,
+                                             size_t current_index);
+
+  // Disambiguates phone field upload types.
+  static void DisambiguatePhoneUploadTypes(FormStructure* form,
+                                           size_t current_index);
+
+  // Disambiguates name field upload types.
+  static void DisambiguateNameUploadTypes(
+      FormStructure* form,
+      size_t current_index,
+      const ServerFieldTypeSet& upload_types);
+
 #ifdef ENABLE_FORM_DEBUG_DUMP
   // Dumps the cached forms to a file on disk.
   void DumpAutofillData(bool imported_cc) const;
@@ -517,6 +535,7 @@ class AutofillManager : public AutofillDownloadManager::Observer,
                            DeterminePossibleFieldTypesForUpload);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest,
                            DeterminePossibleFieldTypesForUploadStressTest);
+  FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest, DisambiguateUploadTypes);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest,
                            DisabledAutofillDispatchesError);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, AddressFilledFormEvents);