Move most importer code to chrome/utility/importer

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 514 matching lines @@
         'browser/autocomplete/history_url_provider_unittest.cc',
         'browser/autocomplete/keyword_provider_unittest.cc',
         'browser/autocomplete/search_provider_unittest.cc',
         'browser/autocomplete/shortcuts_provider_unittest.cc',
         'browser/automation/chrome_frame_automation_provider_win_unittest.cc',
         'browser/background/background_application_list_model_unittest.cc',
         'browser/background/background_contents_service_unittest.cc',
         'browser/background/background_mode_manager_unittest.cc',
         'browser/bookmarks/bookmark_codec_unittest.cc',
         'browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc',
+        'browser/bookmarks/bookmark_html_writer_unittest.cc',
         'browser/bookmarks/bookmark_index_unittest.cc',
         'browser/bookmarks/bookmark_model_test_utils.cc',
         'browser/bookmarks/bookmark_model_test_utils.h',
         'browser/bookmarks/bookmark_model_unittest.cc',
         'browser/bookmarks/bookmark_node_data_unittest.cc',
         'browser/bookmarks/bookmark_utils_unittest.cc',
         'browser/browser_about_handler_unittest.cc',
         'browser/browser_commands_unittest.cc',
         'browser/browsing_data/browsing_data_appcache_helper_unittest.cc',
         'browser/browsing_data/browsing_data_cookie_helper_unittest.cc',
@@ skipping 371 matching lines @@
         'browser/history/text_database_unittest.cc',
         'browser/history/thumbnail_database_unittest.cc',
         'browser/history/top_sites_database_unittest.cc',
         'browser/history/top_sites_impl_unittest.cc',
         'browser/history/top_sites_likely_impl_unittest.cc',
         'browser/history/typed_url_syncable_service_unittest.cc',
         'browser/history/url_database_unittest.cc',
         'browser/history/visit_database_unittest.cc',
         'browser/history/visit_filter_unittest.cc',
         'browser/history/visit_tracker_unittest.cc',
-        'browser/importer/bookmark_html_reader_unittest.cc',
-        'browser/importer/bookmark_html_writer_unittest.cc',
-        'browser/importer/firefox_importer_unittest.cc',
-        'browser/importer/firefox_importer_unittest_messages_internal.h',
-        'browser/importer/firefox_importer_unittest_utils.h',
-        'browser/importer/firefox_importer_unittest_utils_mac.cc',
         'browser/importer/firefox_importer_utils_unittest.cc',
         'browser/importer/firefox_profile_lock_unittest.cc',
         'browser/importer/firefox_proxy_settings_unittest.cc',
-        'browser/importer/ie_importer_unittest_win.cc',
         'browser/importer/profile_writer_unittest.cc',
-        'browser/importer/safari_importer_unittest.mm',
         'browser/internal_auth_unittest.cc',
         'browser/invalidation/invalidation_service_android_unittest.cc',
         'browser/invalidation/invalidation_service_test_template.cc',
         'browser/invalidation/invalidation_service_test_template.h',
         'browser/invalidation/invalidator_storage_unittest.cc',
         'browser/invalidation/ticl_invalidation_service_unittest.cc',
         'browser/language_usage_metrics_unittest.cc',
         'browser/mac/keystone_glue_unittest.mm',
         'browser/managed_mode/managed_mode_unittest.cc',
         'browser/managed_mode/managed_mode_url_filter_unittest.cc',
@@ skipping 829 matching lines @@
         'test/base/chrome_render_view_test.cc',
         'test/base/chrome_render_view_test.h',
         'test/base/menu_model_test.cc',
         'test/base/menu_model_test.h',
         'test/base/v8_unit_test.cc',
         'test/base/v8_unit_test.h',
         'test/data/resource.rc',
         'test/data/unit/framework_unittest.gtestjs',
         'test/logging/win/mof_data_parser_unittest.cc',
         'tools/convert_dict/convert_dict_unittest.cc',
+        'utility/importer/bookmark_html_reader_unittest.cc',
+        'utility/importer/firefox_importer_unittest.cc',
+        'utility/importer/safari_importer_unittest.mm',
 
         # Duplicate these tests here because PathService has more items in
         # unit_tests than in base_unittests.
         '../base/path_service_unittest.cc',
 
         # TODO(joi): Move to //components/components_tests.gypi once
         # remaining dependencies back to //chrome are eliminated.
         '../components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc',
         '../components/autofill/content/browser/autocheckout_manager_unittest.cc',
         '../components/autofill/content/browser/autocheckout_page_meta_data_unittest.cc',
@@ skipping 40 matching lines @@
 
         # TODO(caitkp): Move to //components/components_tests.gypi once
         # remaining dependencies back to //chrome are eliminated.
         '../components/autofill/core/browser/webdata/autofill_entry_unittest.cc',
         '../components/autofill/core/browser/webdata/autofill_table_unittest.cc',
         '../components/autofill/core/browser/webdata/web_data_service_unittest.cc',
         '../components/autofill/core/common/password_form_fill_data_unittest.cc',
         '../components/webdata/common/web_database_migration_unittest.cc',
         '../components/webdata/common/web_data_service_test_util.cc',
         '../components/webdata/common/web_data_service_test_util.h',
+        '../components/webdata/encryptor/ie_importer_unittest_win.cc',
 
         # TODO(joi): Move the google_apis tests to a separate
         # google_apis_unittests executable.
         '../google_apis/google_api_keys_unittest.cc',
         '../google_apis/cup/client_update_protocol_unittest.cc',
         '../google_apis/gaia/mock_url_fetcher_factory.h',
         '../google_apis/gaia/gaia_auth_fetcher_unittest.cc',
         '../google_apis/gaia/gaia_auth_util_unittest.cc',
         '../google_apis/gaia/gaia_oauth_client_unittest.cc',
         '../google_apis/gaia/google_service_auth_error_unittest.cc',
@@ skipping 499 matching lines @@
         }],
         ['OS!="android" and OS!="ios"', {
           'sources!': [
             'browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc',
           ],
         }],
         ['OS=="android"', {
           'sources!': [
             # Bookmark export/import are handled via the BookmarkColumns
             # ContentProvider.
-            'browser/importer/bookmark_html_reader_unittest.cc',
-            'browser/importer/bookmark_html_writer_unittest.cc',
+            'utility/importer/bookmark_html_reader_unittest.cc',

[gab, 2013/07/08 15:18:08]

nit: alphabetical order

[scottmg, 2013/07/09 16:20:49]

Done.

+            'browser/bookmarks/bookmark_html_writer_unittest.cc',
 
             'browser/shell_integration_unittest.cc',
 
             # No service process (which also requires multiprocess lock).
             'common/multi_process_lock_unittest.cc',
 
             # Sync setup uses native ui.
             'browser/ui/webui/sync_setup_handler_unittest.cc',
 
             'browser/browser_commands_unittest.cc',
@@ skipping 266 matching lines @@
               # more details.
               'DebugInformationFormat': '3',
               'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb',
             },
           },
         },
       ],
     }],
   ],  # 'conditions'
 }