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

chrome/chrome_tests.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 31 matching lines @@
         '../testing/gtest.gyp:gtest',
       ],
       'export_dependent_settings': [
         'renderer',
       ],
       'include_dirs': [
         '..',
       ],
       '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',
         'browser/geolocation/arbitrator_dependency_factories_for_tests.h',
         'browser/geolocation/mock_location_provider.cc',
         'browser/geolocation/mock_location_provider.h',
         'browser/mock_browsing_data_appcache_helper.cc',
         'browser/mock_browsing_data_appcache_helper.h',
         'browser/mock_browsing_data_database_helper.cc',
         'browser/mock_browsing_data_database_helper.h',
@@ skipping 286 matching lines @@
         # run time dependency
         '../webkit/support/webkit_support.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       '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',
         'browser/debugger/devtools_sanity_unittest.cc',
         'browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc',
         'browser/instant/instant_browsertest.cc',
         'browser/notifications/notifications_interactive_uitest.cc',
         'browser/ui/views/bookmark_bar_view_test.cc',
         'browser/ui/views/find_bar_host_interactive_uitest.cc',
         'browser/ui/views/tabs/tab_dragging_test.cc',
@@ skipping 693 matching lines @@
         'browser/autocomplete/autocomplete_result_unittest.cc',
         'browser/autocomplete/autocomplete_unittest.cc',
         'browser/autocomplete/history_contents_provider_unittest.cc',
         'browser/autocomplete/history_quick_provider_unittest.cc',
         'browser/autocomplete/history_url_provider_unittest.cc',
         'browser/autocomplete/keyword_provider_unittest.cc',
         'browser/autocomplete/search_provider_unittest.cc',
         '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',
         'browser/autofill/autofill_download_unittest.cc',
         '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',
         'browser/autofill/autofill_xml_parser_unittest.cc',
         'browser/autofill/billing_address_unittest.cc',
         'browser/autofill/contact_info_unittest.cc',
         'browser/autofill/credit_card_field_unittest.cc',
         'browser/autofill/credit_card_unittest.cc',
         'browser/autofill/fax_field_unittest.cc',
         'browser/autofill/form_field_unittest.cc',
@@ skipping 920 matching lines @@
         '..',
       ],
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
         'app/breakpad_mac_stubs.mm',
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
         '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',
         'browser/child_process_security_policy_browsertest.cc',
         'browser/chromeos/cros/cros_in_process_browser_test.cc',
         'browser/chromeos/cros/cros_in_process_browser_test.h',
         'browser/chromeos/cros/cros_mock.cc',
         'browser/chromeos/cros/cros_mock.h',
         'browser/chromeos/cros/mock_cros_library.h',
         'browser/chromeos/cros/mock_cryptohome_library.h',
@@ skipping 858 matching lines @@
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
       # TODO(phajdan.jr): Only temporary, to make transition easier.
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
         'app/chrome_command_ids.h',
         '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',
         'browser/sync/glue/session_model_associator.cc',
         'test/bookmark_load_observer.h',
         'test/out_of_proc_test_runner.cc',
         'test/live_sync/bookmark_model_verifier.cc',
         'test/live_sync/bookmark_model_verifier.h',
         'test/live_sync/live_autofill_sync_test.h',
         'test/live_sync/live_bookmarks_sync_test.h',
@@ skipping 766 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: