Revert 261559 "Create new app_shell.gyp for app_shell targets."

trunk/src/extensions/extensions.gyp

 # Copyright 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': {
     'chromium_code': 1,
   },
   'targets': [
     {
       'target_name': 'extensions_common',
       'type': 'static_library',
       'dependencies': [
-        'common/api/api.gyp:extensions_api',
         '../third_party/re2/re2.gyp:re2',
         # TODO(benwells): figure out what to do with the api target and
         # api resources compiled into the chrome resource bundle.
         # http://crbug.com/162530
         '../chrome/chrome_resources.gyp:chrome_resources',
         # TODO(jamescook|derat): Pull strings into extensions module.
         '../chrome/chrome_resources.gyp:chrome_strings',
+        '../chrome/common/extensions/api/api.gyp:chrome_api',
         '../components/components.gyp:url_matcher',
         '../content/content.gyp:content_common',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
       ],
       'sources': [
         'common/api/messaging/message.h',
         'common/api/sockets/sockets_manifest_handler.cc',
@@ skipping 158 matching lines @@
       ],
     },
     {
       'target_name': 'extensions_browser',
       'type': 'static_library',
       'dependencies': [
         'extensions_common',
         'common/api/api.gyp:extensions_api',
         # TODO(jamescook|derat): Pull strings into extensions module.
         '../chrome/chrome_resources.gyp:chrome_strings',
-        '../components/components.gyp:keyed_service_content',
+        '../chrome/common/extensions/api/api.gyp:chrome_api',
         '../content/content.gyp:content_browser',
         '../skia/skia.gyp:skia',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         # Needed to access generated API headers.
         '<(SHARED_INTERMEDIATE_DIR)',
         # Needed for grit.
@@ skipping 191 matching lines @@
         'common/test_util.cc',
         'common/test_util.h',
         'common/value_builder.cc',
         'common/value_builder.h',
       ],
       # Disable c4267 warnings until we fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
   ]
 }