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

chrome/chrome_browser_ui.gypi

 # Copyright 2012 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': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 2735 matching lines @@
         'common_net',
         'encrypted_cert_logger_proto',
         '../components/components.gyp:auto_login_parser',
         '../components/components.gyp:device_event_log_component',
         '../components/components.gyp:dom_distiller_core',
         '../components/components.gyp:dom_distiller_webui',
         '../components/components.gyp:invalidation_impl',
         '../components/components.gyp:omnibox_common',
         '../components/components.gyp:onc_component',
         '../components/components.gyp:password_manager_core_browser',
+        '../components/components.gyp:secure_display',
         '../components/components.gyp:sync_driver',
         '../components/components.gyp:toolbar',
         '../components/components.gyp:ui_zoom',
         '../components/components.gyp:update_client',
         '../components/components_resources.gyp:components_resources',
         '../components/components_strings.gyp:components_strings',
-        '../components/url_formatter/url_formatter.gyp:url_formatter',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/zlib/zlib.gyp:zlib',
@@ skipping 30 matching lines @@
             '<@(chrome_browser_ui_non_ios_sources)',
             '<@(chrome_browser_ui_toolbar_model_sources)',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/omnibox/omnibox.mojom.cc',
           ],
           'dependencies': [
             'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings',
             'debugger',
             'installer_util',
             '../components/components.gyp:app_modal',
             '../components/components.gyp:autofill_content_risk_proto',
+            '../components/components.gyp:secure_display',
             '../components/components.gyp:translate_content_common',
             '../content/app/resources/content_resources.gyp:content_resources',
             '../media/media.gyp:media',
             '../net/net.gyp:net_with_v8',
             '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
             '../third_party/re2/re2.gyp:re2',
             '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
@@ skipping 387 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }