Revert of Move net::FormatUrl and friends outside of //net and into //components

components/components_tests.gyp

 # Copyright 2014 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': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 446 matching lines @@
       'proximity_auth/ble/bluetooth_low_energy_characteristics_finder_unittest.cc',
       'proximity_auth/ble/bluetooth_low_energy_connection_finder_unittest.cc',
       'proximity_auth/ble/bluetooth_low_energy_connection_unittest.cc',
       'proximity_auth/ble/bluetooth_low_energy_device_whitelist_unittest.cc',
       'proximity_auth/ble/proximity_auth_ble_system_unittest.cc',
       'proximity_auth/bluetooth_connection_finder_unittest.cc',
       'proximity_auth/bluetooth_connection_unittest.cc',
       'proximity_auth/bluetooth_throttler_impl_unittest.cc',
       'proximity_auth/client_impl_unittest.cc',
       'proximity_auth/connection_unittest.cc',
+      'proximity_auth/device_to_device_operations_unittest.cc',
       'proximity_auth/cryptauth/base64url_unittest.cc',
       'proximity_auth/cryptauth/cryptauth_access_token_fetcher_impl_unittest.cc',
       'proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc',
       'proximity_auth/cryptauth/cryptauth_client_impl_unittest.cc',
       'proximity_auth/cryptauth/cryptauth_device_manager_unittest.cc',
       'proximity_auth/cryptauth/cryptauth_enroller_impl_unittest.cc',
       'proximity_auth/cryptauth/cryptauth_enrollment_manager_unittest.cc',
       'proximity_auth/cryptauth/cryptauth_gcm_manager_impl_unittest.cc',
       'proximity_auth/cryptauth/fake_secure_message_delegate_unittest.cc',
       'proximity_auth/cryptauth/sync_scheduler_impl_unittest.cc',
       'proximity_auth/device_to_device_operations_unittest.cc',
-      'proximity_auth/device_to_device_operations_unittest.cc',
       'proximity_auth/device_to_device_secure_context_unittest.cc',
       'proximity_auth/logging/logging_unittest.cc',
       'proximity_auth/proximity_auth_system_unittest.cc',
       'proximity_auth/proximity_monitor_impl_unittest.cc',
       'proximity_auth/remote_status_update_unittest.cc',
       'proximity_auth/throttled_bluetooth_connection_finder_unittest.cc',
       'proximity_auth/wire_message_unittest.cc',
     ],
     'proxy_config_unittest_sources': [
       'proxy_config/proxy_config_dictionary_unittest.cc',
@@ skipping 51 matching lines @@
       'search_engines/keyword_table_unittest.cc',
       'search_engines/search_host_to_urls_map_unittest.cc',
       'search_engines/template_url_prepopulate_data_unittest.cc',
       'search_engines/template_url_service_util_unittest.cc',
       'search_engines/template_url_unittest.cc',
     ],
     'search_provider_logos_unittest_sources': [
       'search_provider_logos/logo_cache_unittest.cc',
       'search_provider_logos/logo_tracker_unittest.cc',
     ],
+    'secure_display_unittest_sources': [
+      'secure_display/elide_url_unittest.cc',
+    ],
     'sessions_unittest_sources': [
       'sessions/content/content_serialized_navigation_builder_unittest.cc',
       'sessions/content/content_serialized_navigation_driver_unittest.cc',
       'sessions/ios/ios_serialized_navigation_builder_unittest.cc',
       'sessions/ios/ios_serialized_navigation_driver_unittest.cc',
       'sessions/serialized_navigation_entry_unittest.cc',
       'sessions/session_backend_unittest.cc',
       'sessions/session_types_unittest.cc',
     ],
     'signin_unittest_sources': [
@@ skipping 53 matching lines @@
     'update_client_unittest_sources': [
       'update_client/component_patcher_unittest.cc',
       'update_client/crx_downloader_unittest.cc',
       'update_client/ping_manager_unittest.cc',
       'update_client/request_sender_unittest.cc',
       'update_client/update_checker_unittest.cc',
       'update_client/update_client_unittest.cc',
       'update_client/update_query_params_unittest.cc',
       'update_client/update_response_unittest.cc',
     ],
-    'url_formatter_unittest_sources': [
-      'url_formatter/elide_url_unittest.cc',
-      'url_formatter/url_fixer_unittest.cc',
-      'url_formatter/url_formatter_unittest.cc',
+    'url_fixer_unittest_sources': [
+      'url_fixer/url_fixer_unittest.cc',
     ],
     'url_matcher_unittest_sources': [
       'url_matcher/regex_set_matcher_unittest.cc',
       'url_matcher/string_pattern_unittest.cc',
       'url_matcher/substring_set_matcher_unittest.cc',
       'url_matcher/url_matcher_factory_unittest.cc',
       'url_matcher/url_matcher_unittest.cc',
     ],
     'variations_unittest_sources': [
       'variations/active_field_trials_unittest.cc',
@@ skipping 112 matching lines @@
         '<@(os_crypt_unittest_sources)',
         '<@(packed_ct_ev_whitelist_unittest_sources)',
         '<@(password_manager_unittest_sources)',
         '<@(precache_unittest_sources)',
         '<@(proxy_config_unittest_sources)',
         '<@(query_parser_unittest_sources)',
         '<@(rappor_unittest_sources)',
         '<@(search_unittest_sources)',
         '<@(search_engines_unittest_sources)',
         '<@(search_provider_logos_unittest_sources)',
+        '<@(secure_display_unittest_sources)',
         '<@(sessions_unittest_sources)',
         '<@(signin_unittest_sources)',
         '<@(suggestions_unittest_sources)',
         '<@(sync_driver_unittest_sources)',
         '<@(translate_unittest_sources)',
         '<@(undo_unittest_sources)',
         '<@(update_client_unittest_sources)',
-        '<@(url_formatter_unittest_sources)',
+        '<@(url_fixer_unittest_sources)',
         '<@(url_matcher_unittest_sources)',
         '<@(variations_unittest_sources)',
         '<@(wallpaper_unittest_sources)',
         '<@(web_resource_unittest_sources)',
         '<@(webdata_unittest_sources)',
       ],
       'include_dirs': [
         '..',
       ],
       'dependencies': [
@@ skipping 82 matching lines @@
         'components.gyp:precache_core',
         'components.gyp:pref_registry_test_support',
         'components.gyp:proxy_config',
         'components.gyp:query_parser',
         'components.gyp:rappor',
         'components.gyp:rappor_test_support',
         'components.gyp:search',
         'components.gyp:search_engines',
         'components.gyp:search_engines_test_support',
         'components.gyp:search_provider_logos',
+        'components.gyp:secure_display',
         'components.gyp:sessions_test_support',
         'components.gyp:signin_core_browser',
         'components.gyp:signin_core_browser_test_support',
         'components.gyp:suggestions',
         'components.gyp:sync_driver_test_support',
         'components.gyp:translate_core_browser',
         'components.gyp:translate_core_common',
         'components.gyp:translate_core_language_detection',
         'components.gyp:ui_zoom',
         'components.gyp:undo_component',
         'components.gyp:update_client',
         'components.gyp:update_client_test_support',
+        'components.gyp:url_fixer',
         'components.gyp:variations',
         'components.gyp:variations_http_provider',
         'components.gyp:wallpaper',
         'components.gyp:web_resource',
         'components.gyp:web_resource_test_support',
         'components_resources.gyp:components_resources',
         'components_strings.gyp:components_strings',
         'components_tests_pak',
         'mime_util/mime_util.gyp:mime_util',
-        'url_formatter/url_formatter.gyp:url_formatter',
       ],
       'conditions': [
         ['enable_rlz_support==1', {
           'sources': [
             '<@(rlz_unittest_sources)',
           ],
           'dependencies': [
             '../net/net.gyp:net_test_support',
             '../rlz/rlz.gyp:test_support_rlz',
             'components.gyp:rlz',
@@ skipping 674 matching lines @@
               'invalidation/impl/android/junit/',
               'policy/android/junit/'
             ],
           },
           'includes': [ '../build/host_jar.gypi' ],
          },
       ],
     }],
   ],
 }