Revert 198834 "Add chrome_split_dll gyp variable, and duplicate ..."

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
     # Linux or Mac, and into chrome.dll on Windows.
     # NOTE: Most new includes should go in the OS!="ios" condition below.
-    'chromium_browser_dependencies': [
+    'chromium_dependencies': [
       'common',
       'browser',
       '../content/content.gyp:content_app',
       '../sync/sync.gyp:sync',
     ],
-    'chromium_child_dependencies': [
-      'common',
-      '../content/content.gyp:content_app',
-      '../sync/sync.gyp:sync',
-    ],
     'allocator_target': '../base/allocator/allocator.gyp:allocator',
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
     'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
     # TODO: remove this helper when we have loops in GYP
     'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
     'conditions': [
       ['OS!="ios"', {
-        'chromium_browser_dependencies': [
-          'debugger',
-          '../content/content.gyp:content_ppapi_plugin',
-          '../printing/printing.gyp:printing',
-        ],
-        'chromium_child_dependencies': [
+        'chromium_dependencies': [
           'debugger',
           'plugin',
           'renderer',
           'utility',
           '../content/content.gyp:content_gpu',
           '../content/content.gyp:content_ppapi_plugin',
           '../content/content.gyp:content_worker',
           '../printing/printing.gyp:printing',
           '../third_party/WebKit/Source/devtools/devtools.gyp:devtools_frontend_resources',
         ],
       }],
       ['OS=="win"', {
         'nacl_defines': [
           'NACL_WINDOWS=1',
           'NACL_LINUX=0',
           'NACL_OSX=0',
         ],
         'platform_locale_settings_grd':
             'app/resources/locale_settings_win.grd',
       },],
       ['OS!="android" and OS!="ios"', {
-        'chromium_browser_dependencies': [
+        'chromium_dependencies': [
           # Android doesn't use the service process (only needed for print).
           'service',
         ],
       }],
       ['OS=="linux"', {
         'nacl_defines': [
           'NACL_WINDOWS=0',
           'NACL_LINUX=1',
           'NACL_OSX=0',
         ],
@@ skipping 1077 matching lines @@
             '../build/java.gypi',
           ],
         },
       ], # 'targets'
       'includes': [
         'chrome_android.gypi',
       ]}, # 'includes'
     ],  # OS=="android"
   ],  # 'conditions'
 }