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

trunk/src/components/components_tests.gypi

 # 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.
 
 {
   'conditions': [
     ['OS != "ios"', {
       'targets': [
         {
           'target_name': 'components_unittests',
@@ skipping 25 matching lines @@
             # Dependencies of autofill
             'autofill_core_browser',
 
             # Dependencies of browser_context_keyed_service
             'browser_context_keyed_service',
 
             # Dependencies of encryptor
             'encryptor',
 
             # Dependencies of intercept_navigation_resource_throttle_unittest.cc
-            '../content/content_shell_and_tests.gyp:test_support_content',
+            '../content/content.gyp:test_support_content',
             '../skia/skia.gyp:skia',
             'navigation_interception',
 
             # Dependencies of sessions
             '../third_party/protobuf/protobuf.gyp:protobuf_lite',
             'sessions',
             'sessions_test_support',
 
             # Dependencies of visitedlink
             'visitedlink_browser',
@@ skipping 29 matching lines @@
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
         },
         {
           'target_name': 'components_perftests',
           'type': '<(gtest_target_type)',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_perf',
-            '../content/content_shell_and_tests.gyp:test_support_content',
+            '../content/content.gyp:test_support_content',
             '../testing/gtest.gyp:gtest',
             '../ui/compositor/compositor.gyp:compositor',
             'visitedlink_browser',
           ],
          'include_dirs': [
            '..',
          ],
          'sources': [
            'visitedlink/test/visitedlink_perftest.cc',
          ],
@@ skipping 22 matching lines @@
                 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)components_unittests<(SHARED_LIB_SUFFIX)',
               },
               'includes': [ '../build/apk_test.gypi' ],
             },
           ],
         }],
       ],
     }],
   ],
 }