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

components/history.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/history/core/browser
       'target_name': 'history_core_browser',
       'type': 'static_library',
@@ skipping 11 matching lines @@
         '../sync/sync.gyp:sync',
         '../third_party/sqlite/sqlite.gyp:sqlite',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/gfx/gfx.gyp:gfx',
         '../url/url.gyp:url_lib',
         'favicon_base',
         'history_core_common',
         'keyed_service_core',
         'query_parser',
         'signin_core_browser',
-        'url_formatter/url_formatter.gyp:url_formatter',
       ],
       'export_dependent_settings': [
         '../skia/skia.gyp:skia',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         'history/core/browser/delete_directive_handler.cc',
         'history/core/browser/delete_directive_handler.h',
         'history/core/browser/download_constants.h',
         'history/core/browser/download_database.cc',
@@ skipping 204 matching lines @@
             'history/ios/browser/history_database_helper.cc',
             'history/ios/browser/history_database_helper.h',
             'history/ios/browser/web_state_top_sites_observer.cc',
             'history/ios/browser/web_state_top_sites_observer.h',
           ],
         },
       ],
     }],
   ],
 }