Revert 209420 "Factor out content shell and tests into a standal..."

trunk/src/ash/ash.gyp

 # Copyright (c) 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': {
     'chromium_code': 1,
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
   'includes': [
@@ skipping 608 matching lines @@
       ],
     },
     {
       'target_name': 'ash_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../chrome/chrome_resources.gyp:packed_resources',
         '../content/content.gyp:content_browser',
-        '../content/content_shell_and_tests.gyp:test_support_content',
+        '../content/content.gyp:test_support_content',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/app_list/app_list.gyp:app_list',
         '../ui/aura/aura.gyp:aura',
         '../ui/aura/aura.gyp:aura_test_support',
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
@@ skipping 161 matching lines @@
       ],
     },
     {
       'target_name': 'ash_shell',
       'type': 'executable',
       'dependencies': [
         'ash_strings.gyp:ash_strings',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../chrome/chrome_resources.gyp:packed_resources',
+        '../content/content.gyp:content_shell_lib',
         '../content/content.gyp:content',
-        '../content/content_shell_and_tests.gyp:content_shell_lib',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/app_list/app_list.gyp:app_list',
         '../ui/aura/aura.gyp:aura',
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
@@ skipping 69 matching lines @@
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
   ],
 }