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

trunk/src/chrome/chrome_exe.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.
 
 {
   'targets': [
     {
       'target_name': 'chrome',
       'type': 'executable',
       'mac_bundle': 1,
@@ skipping 124 matching lines @@
                       'files': ['app/theme/chromium/product_logo_48.png']
                     }],
                   ],
                 },
               ],
             }],
             ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 # On Linux, link the dependencies (libraries) that make up actual
                 # Chromium functionality directly into the executable.
-                '<@(chromium_browser_dependencies)',
-                '<@(chromium_child_dependencies)',
+                '<@(chromium_dependencies)',
                 # Needed for chrome_main.cc initialization of libraries.
                 '../build/linux/system.gyp:gtk',
                 # Needed to use the master_preferences functions
                 'installer_util',
               ],
             }, { # else toolkit_uses_gtk == 1
               'dependencies': [
                 # On Linux, link the dependencies (libraries) that make up actual
                 # Chromium functionality directly into the executable.
-                '<@(chromium_browser_dependencies)',
-                '<@(chromium_child_dependencies)',
+                '<@(chromium_dependencies)',
                 # Needed for chrome_main.cc initialization of libraries.
                 '../build/linux/system.gyp:x11',
                 '../build/linux/system.gyp:pangocairo',
                 '../build/linux/system.gyp:xext',
                 # Needed to use the master_preferences functions
                 'installer_util',
               ],
             }],
           ],
           'sources': [
@@ skipping 457 matching lines @@
               'dependencies': [
                 'chrome_nacl_win64',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }