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

components/app_modal.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': [
     {
       'target_name': 'app_modal',
       'type': 'static_library',
       'dependencies': [
-        '../content/content.gyp:content_browser',
-        '../content/content.gyp:content_common',
+        '../content/content.gyp:content_browser',
+        '../content/content.gyp:content_common',
         '../skia/skia.gyp:skia',
         'components_strings.gyp:components_strings',
-        'url_formatter/url_formatter.gyp:url_formatter',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'app_modal/app_modal_dialog.cc',
         'app_modal/app_modal_dialog.h',
         'app_modal/app_modal_dialog_queue.cc',
         'app_modal/app_modal_dialog_queue.h',
         'app_modal/javascript_app_modal_dialog.cc',
@@ skipping 13 matching lines @@
         ['toolkit_views==1', {
           'sources': [
             'app_modal/views/javascript_app_modal_dialog_views.cc',
             'app_modal/views/javascript_app_modal_dialog_views.h',
           ],
         }],
       ],
     },
   ],
 }