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

trunk/src/chrome/chrome.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,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 886 matching lines @@
           # For historical reasons, chrome/chrome.sln has been the entry point
           # for new Chrome developers. To assist development, include several
           # core unittests that are otherwise only accessible side-by-side with
           # chrome via all/all.sln.
           'target_name': 'test_targets',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_unittests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
-            '../content/content_shell_and_tests.gyp:content_browsertests',
-            '../content/content_shell_and_tests.gyp:content_unittests',
-            '../content/content_shell_and_tests.gyp:content_shell',
+            '../content/content.gyp:content_browsertests',
+            '../content/content.gyp:content_shell',
+            '../content/content.gyp:content_unittests',
             '../net/net.gyp:net_unittests',
             '../ui/ui.gyp:ui_unittests',
           ],
           'conditions': [
             ['use_aura==1 or target_arch=="x64"', {
               'dependencies!': [
                 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
                 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
               ],
             }],
@@ skipping 248 matching lines @@
       ], # 'targets'
       'includes': [
         'chrome_android.gypi',
       ]}, # 'includes'
     ],  # OS=="android"
     ['configuration_policy==1 and OS!="android"', {
       'includes': [ 'policy.gypi', ],
     }],
   ],  # 'conditions'
 }