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

components/components.gyp

 # Copyright (c) 2013 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': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 44 matching lines @@
     'policy.gypi',
     'precache.gypi',
     'pref_registry.gypi',
     'proxy_config.gypi',
     'query_parser.gypi',
     'rappor.gypi',
     'renderer_context_menu.gypi',
     'search.gypi',
     'search_engines.gypi',
     'search_provider_logos.gypi',
+    'secure_display.gypi',
     'security_interstitials.gypi',
     'sessions.gypi',
     'signin.gypi',
     'startup_metric_utils.gypi',
     'suggestions.gypi',
     'sync_driver.gypi',
     'toolbar.gypi',
     'translate.gypi',
     'ui_zoom.gypi',
     'undo.gypi',
     'update_client.gypi',
+    'url_fixer.gypi',
     'url_matcher.gypi',
     'user_prefs.gypi',
     'variations.gypi',
     'version_info.gypi',
     'wallpaper.gypi',
     'web_resource.gypi',
     'webdata.gypi',
     'webdata_services.gypi',
   ],
   'conditions': [
@@ skipping 81 matching lines @@
         'chrome_apps.gypi',
       ],
     }],
     ['enable_rlz_support==1', {
       'includes': [
         'rlz.gypi',
       ],
     }]
   ],
 }