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

chrome/chrome_utility.gypi

 # 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': {
     'chrome_utility_sources': [
       'utility/chrome_content_utility_client.cc',
       'utility/chrome_content_utility_client.h',
       'utility/chrome_content_utility_ipc_whitelist.cc',
@@ skipping 87 matching lines @@
     {
       # GN version: //chrome/utility
       'target_name': 'utility',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '../base/base.gyp:base',
         '../components/components_strings.gyp:components_strings',
         '../components/components.gyp:safe_json_parser_message_filter',
         '../components/components.gyp:search_engines',
-        '../components/url_formatter/url_formatter.gyp:url_formatter',
+        '../components/components.gyp:url_fixer',
         '../content/content.gyp:content_common',
         '../content/content.gyp:content_utility',
         '../media/media.gyp:media',
         '../skia/skia.gyp:skia',
         '../third_party/libxml/libxml.gyp:libxml',
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
         'common',
       ],
       'include_dirs': [
@@ skipping 79 matching lines @@
             'utility/local_discovery/service_discovery_message_handler.cc',
             'utility/local_discovery/service_discovery_message_handler.h',
           ]
         }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
   ],
 }