Add a data-driven unit test to validate autofill profile merging during aggregation.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 7aa7bb9a0e62df3c9b8bec7e71a3ac2b0d9a6460..875814acbfbca731bda50470bd9274e9e5949d94 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -49,6 +49,10 @@
       ],
       'sources': [
         'app/breakpad_mac_stubs.mm',
+        'browser/autofill/autofill_common_test.cc',
+        'browser/autofill/autofill_common_test.h',
+        'browser/autofill/data_driven_test.cc',
+        'browser/autofill/data_driven_test.h',
         # The only thing used from browser is Browser::Type.
         'browser/extensions/test_extension_prefs.cc',
         'browser/extensions/test_extension_prefs.h',
@@ -355,9 +359,7 @@
       'sources': [
         'browser/accessibility/accessibility_mac_uitest.mm',
         'browser/autocomplete/autocomplete_edit_view_browsertest.cc',
-        'browser/autofill/autofill_common_test.cc',
         'browser/autofill/autofill_browsertest.cc',
-        'browser/autofill/form_structure_browsertest.cc',
         'browser/browser_focus_uitest.cc',
         'browser/browser_keyevents_browsertest.cc',
         'browser/collected_cookies_uitest.cc',
@@ -1071,8 +1073,6 @@
         'browser/autofill/address_field_unittest.cc',
         'browser/autofill/autofill_address_model_mac_unittest.mm',
         'browser/autofill/autofill_address_sheet_controller_mac_unittest.mm',
-        'browser/autofill/autofill_common_test.cc',
-        'browser/autofill/autofill_common_test.h',
         'browser/autofill/autofill_credit_card_model_mac_unittest.mm',
         'browser/autofill/autofill_credit_card_sheet_controller_mac_unittest.mm',
         'browser/autofill/autofill_dialog_controller_mac_unittest.mm',
@@ -1080,6 +1080,7 @@
         'browser/autofill/autofill_field_unittest.cc',
         'browser/autofill/autofill_ie_toolbar_import_win_unittest.cc',
         'browser/autofill/autofill_manager_unittest.cc',
+        'browser/autofill/autofill_merge_unittest.cc',
         'browser/autofill/autofill_metrics_unittest.cc',
         'browser/autofill/autofill_profile_unittest.cc',
         'browser/autofill/autofill_type_unittest.cc',
@@ -2020,6 +2021,7 @@
         'app/chrome_dll_resource.h',
         'app/chrome_dll_version.rc.version',
         'browser/autocomplete/autocomplete_browsertest.cc',
+        'browser/autofill/form_structure_browsertest.cc',
         'browser/browser_browsertest.cc',
         'browser/browsing_data_database_helper_browsertest.cc',
         'browser/browsing_data_local_storage_helper_browsertest.cc',
@@ -2898,8 +2900,6 @@
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
         'app/chrome_dll_version.rc.version',
-        'browser/autofill/autofill_common_test.cc',
-        'browser/autofill/autofill_common_test.h',
         'browser/password_manager/password_form_data.cc',
         'browser/sessions/session_backend.cc',
         'browser/sessions/session_service_test_helper.cc',