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

trunk/src/chrome/chrome_tests.gypi

 # 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 2803 matching lines @@
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)',  # Needed by key_systems.cc.
           ],
           'dependencies': [
             'browser',
             'chrome_resources.gyp:chrome_resources',
             'chrome_resources.gyp:chrome_strings',
             'common',
             'renderer',
             '../content/content.gyp:content_gpu',
-            '../content/content_shell_and_tests.gyp:test_support_content',
+            '../content/content.gyp:test_support_content',
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../base/base.gyp:test_support_perf',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
             '../webkit/support/webkit_support.gyp:glue',
             '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
           ],
           'sources': [
             'test/perf/perftests.cc',
@@ skipping 321 matching lines @@
                 # courgette source directory in an include path.
                 '../courgette/courgette.gyp:courgette_unittests',
                 'browser_tests',
                 ]}],
             ['OS=="linux"', {
               'dependencies': [
                 # Win bot needs to be turned into an interactive bot.
                 'interactive_ui_tests',
                 # Disabled from running in coverage_posix.py.
                 # We need to build this during compile step, so enabling here.
-                '../content/content_shell_and_tests.gyp:content_browsertests',
+                '../content/content.gyp:content_browsertests',
                 '../courgette/courgette.gyp:courgette_unittests',
                 '../crypto/crypto.gyp:crypto_unittests',
                 '../jingle/jingle.gyp:jingle_unittests',
                 '../net/net.gyp:net_perftests',
                 '../third_party/WebKit/public/all.gyp:all_blink',
                 '../url/url.gyp:googleurl_unittests',
                 'browser_tests',
                 'chromedriver_unittests',
                 'gpu_tests',
                 'performance_ui_tests',
@@ skipping 89 matching lines @@
     ['OS == "android"', {
       'targets': [
         {
           'target_name': 'chromium_testshell_test_apk',
           'type': 'none',
           'dependencies': [
             'chrome_java',
             'chromium_testshell_java',
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
-            '../content/content_shell_and_tests.gyp:content_java_test_support',
+            '../content/content.gyp:content_java_test_support',
             '../sync/sync.gyp:sync_javatests',
             '../tools/android/forwarder/forwarder.gyp:forwarder',
           ],
           'variables': {
             'apk_name': 'ChromiumTestShellTest',
             'java_in_dir': 'android/testshell/javatests',
             'resource_dir': 'android/testshell/res',
             'additional_src_dirs': ['android/javatests/src'],
             'is_test_apk': 1,
           },
@@ skipping 128 matching lines @@
             '../base/base.gyp:test_support_base',
           ],
           'sources': [
             'browser/local_discovery/service_discovery_sniffer.h',
             'browser/local_discovery/service_discovery_sniffer.cc',
           ],
         }]
     }],
   ],  # 'conditions'
 }