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

components/omnibox.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/omnibox/browser
       'target_name': 'omnibox_browser',
       'type': 'static_library',
@@ skipping 10 matching lines @@
         'components_resources.gyp:components_resources',
         'components_strings.gyp:components_strings',
         'history_core_browser',
         'keyed_service_core',
         'omnibox_common',
         'omnibox_in_memory_url_index_cache_proto',
         'pref_registry',
         'query_parser',
         'search',
         'search_engines',
-        'url_formatter/url_formatter.gyp:url_formatter',
+        'url_fixer',
         'variations_http_provider',
       ],
       'export_dependent_settings': [
         'component_metrics_proto',
         'history_core_browser',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
@@ skipping 114 matching lines @@
       'sources': [
         # Note: sources list duplicated in GN build.
         'omnibox/browser/mock_autocomplete_provider_client.cc',
         'omnibox/browser/mock_autocomplete_provider_client.h',
         'omnibox/browser/test_scheme_classifier.cc',
         'omnibox/browser/test_scheme_classifier.h',
       ],
     },
   ],
 }