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

trunk/src/chrome/chrome.gyp

Index: trunk/src/chrome/chrome.gyp
===================================================================
--- trunk/src/chrome/chrome.gyp	(revision 198835)
+++ trunk/src/chrome/chrome.gyp	(working copy)
@@ -10,17 +10,12 @@
     # 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',
@@ -29,13 +24,8 @@
     'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
     'conditions': [
       ['OS!="ios"', {
-        'chromium_browser_dependencies': [
+        'chromium_dependencies': [
           'debugger',
-          '../content/content.gyp:content_ppapi_plugin',
-          '../printing/printing.gyp:printing',
-        ],
-        'chromium_child_dependencies': [
-          'debugger',
           'plugin',
           'renderer',
           'utility',
@@ -56,7 +46,7 @@
             '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',
         ],