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

components/search_engines.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.
 
 {
   'targets': [
     {
       # GN version: //components/search_engines
       'target_name': 'search_engines',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../google_apis/google_apis.gyp:google_apis',
         '../net/net.gyp:net',
         '../sql/sql.gyp:sql',
         '../sync/sync.gyp:sync',
         '../third_party/libxml/libxml.gyp:libxml',
         '../ui/gfx/gfx.gyp:gfx',
         '../url/url.gyp:url_lib',
         'component_metrics_proto',
         'components_strings.gyp:components_strings',
         'google_core_browser',
         'history_core_browser',
         'keyed_service_core',
         'policy',
         'pref_registry',
         'rappor',
         'search_engines/prepopulated_engines.gyp:prepopulated_engines',
-        'url_formatter/url_formatter.gyp:url_formatter',
+        'url_fixer',
         'webdata_common',
       ],
       'export_dependent_settings': [
         'component_metrics_proto',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
@@ skipping 59 matching lines @@
       ],
       'sources': [
         'search_engines/default_search_pref_test_util.cc',
         'search_engines/default_search_pref_test_util.h',
         'search_engines/testing_search_terms_data.cc',
         'search_engines/testing_search_terms_data.h',
       ],
     },
   ],
 }