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

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 7e886553317879c640287eeff8dfb4d48465043f..018fc1a32aa99e83e45b2c0eefb9c728e111d52d 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -464,6 +464,7 @@
       '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',
@@ -474,7 +475,6 @@
       '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',
@@ -547,6 +547,9 @@
       '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',
@@ -620,10 +623,8 @@
       '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',
@@ -756,6 +757,7 @@
         '<@(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)',
@@ -763,7 +765,7 @@
         '<@(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)',
@@ -866,6 +868,7 @@
         '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',
@@ -878,6 +881,7 @@
         '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',
@@ -887,7 +891,6 @@
         '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', {