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

trunk/src/content/content.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,  # Use higher warning level.
     'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
     'conditions': [
       ['inside_chromium_build==0', {
@@ skipping 46 matching lines @@
       'targets': [
         {
           'target_name': 'content',
           'type': 'none',
           'dependencies': [
             'content_app',
             'content_browser',
             'content_common',
           ],
           'conditions': [
-            ['OS != "ios" and chrome_split_dll != 1', {
+            ['OS != "ios"', {
               'dependencies': [
                 'content_gpu',
                 'content_plugin',
                 'content_ppapi_plugin',
                 'content_renderer',
                 'content_utility',
                 'content_worker',
               ],
             }],
           ],
@@ skipping 14 matching lines @@
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'includes': [
             'content_browser.gypi',
           ],
           'dependencies': [
             'content_common',
             'content_resources.gyp:content_resources',
           ],
           'conditions': [
-            ['OS != "ios" and chrome_split_dll != 1', {
+            ['OS != "ios"', {
               'dependencies': [
                 'content_gpu',
                 'content_renderer',
               ],
             }],
-            ['chrome_split_dll', {
-              'dependencies': [
-                'content_gpu',
-              ],
-            }],
           ],
         },
         {
           'target_name': 'content_common',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'includes': [
             'content_common.gypi',
           ],
           'conditions': [
@@ skipping 273 matching lines @@
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/content',
             ],
           },
           'includes': [ 'content_jni.gypi' ],
         },
       ],
     }],  # OS == "android"
   ],
 }