Enable content component (again!).

chrome/chrome_installer_util.gypi

 # Copyright (c) 2011 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.
 
 {
   'target_defaults': {
     'variables': {
       'installer_util_target': 0,
     },
     'target_conditions': [
@@ skipping 79 matching lines @@
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'installer_util',
           'type': 'static_library',
           'variables': {
             'installer_util_target': 1,
           },
           'dependencies': [
             'installer_util_strings',
-            '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
             'common_constants',
             'chrome_resources.gyp:chrome_resources',
             'chrome_resources.gyp:chrome_strings',
-            '../content/content.gyp:content_common',
             '<(DEPTH)/base/base.gyp:base',
             '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
+            '<(DEPTH)/content/content.gyp:content_common',
             '<(DEPTH)/courgette/courgette.gyp:courgette_lib',
             '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch',
             '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
             '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
             '<(DEPTH)/third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
           ],
           'sources': [
             'installer/util/chrome_browser_operations.cc',
             'installer/util/chrome_browser_operations.h',
             'installer/util/chrome_browser_sxs_operations.cc',
@@ skipping 17 matching lines @@
             'installer/util/master_preferences.cc',
             'installer/util/master_preferences.h',
             'installer/util/product.h',
             'installer/util/product.cc',
             'installer/util/product_operations.h',
             'installer/util/self_cleaning_temp_dir.cc',
             'installer/util/self_cleaning_temp_dir.h',
             'installer/util/shell_util.cc',
             'installer/util/shell_util.h',
           ],
+          'conditions': [
+            ['component=="shared_library" and incremental_chrome_dll!=1', {
+              'sources': [ '../content/public/common/content_switches.cc' ],
+              'defines': [ 'COMPILE_CONTENT_STATICALLY'],
+            }, {
+              'dependencies': ['<(DEPTH)/content/content.gyp:content_common'],
+            }],
+          ],
         },
         {
           'target_name': 'installer_util_nacl_win64',
           'type': 'static_library',
           'variables': {
             'installer_util_target': 1,
           },
           'dependencies': [
             'installer_util_strings',
           ],
@@ skipping 25 matching lines @@
           ],
           'sources': [
             'installer/util/master_preferences.cc',
             'installer/util/master_preferences.h',
             'installer/util/master_preferences_constants.cc',
             'installer/util/master_preferences_constants.h',
           ],
           'include_dirs': [
             '<(DEPTH)',
           ],
+          'conditions': [
+            ['component == "shared_library"', {
+              'sources': [ '../content/public/common/content_switches.cc' ],
+              'defines': [ 'COMPILE_CONTENT_STATICALLY'],
+            }],
+          ],
         }
       ],
     }],
+
   ],
 }