Add installer_util_unittests to the GN windows build

chrome/chrome_installer.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.
 
 {
   'variables': {
     'lastchange_path': '../build/util/LASTCHANGE',
     'libpeer_target_type%': 'static_library',
     'branding_dir': 'app/theme/<(branding_path_component)',
     'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component)',
@@ skipping 58 matching lines @@
             'installer/gcapi/gcapi_omaha_experiment_test.cc',
             'installer/gcapi/gcapi_reactivation_test.cc',
             'installer/gcapi/gcapi_test.cc',
             'installer/gcapi/gcapi_test.rc',
             'installer/gcapi/gcapi_test_registry_overrider.cc',
             'installer/gcapi/gcapi_test_registry_overrider.h',
             'installer/gcapi/resource.h',
           ],
         },
         {
+          # GN version: //chrome/installer/util:installer_util_unittests
           'target_name': 'installer_util_unittests',
           'type': 'executable',
           'dependencies': [
             'installer_util',
             'installer_util_strings',
             'installer/upgrade_test.gyp:alternate_version_generator_lib',
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '../base/base.gyp:test_support_base',
             '../chrome/chrome.gyp:chrome_version_resources',
             '../content/content.gyp:content_common',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
+            # List duplicated in GN build.
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             'installer/setup/compat_checks_unittest.cc',
             'installer/setup/setup_constants.cc',
             'installer/util/advanced_firewall_manager_win_unittest.cc',
             'installer/util/callback_work_item_unittest.cc',
             'installer/util/channel_info_unittest.cc',
             'installer/util/copy_tree_work_item_unittest.cc',
             'installer/util/create_dir_work_item_unittest.cc',
             'installer/util/create_reg_key_work_item_unittest.cc',
             'installer/util/delete_after_reboot_helper_unittest.cc',
@@ skipping 46 matching lines @@
         {
           # GN version: //chrome/installer/util:strings
           'target_name': 'installer_util_strings',
           'type': 'none',
           'actions': [
             {
               'action_name': 'installer_util_strings',
               'variables': {
                 'create_string_rc_py': 'installer/util/prebuild/create_string_rc.py',
                 'brand_strings': '<(branding_path_component)_strings',
+                'gen_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util',
               },
 
               'inputs': [
                 '<(create_string_rc_py)',
                 'app/<(brand_strings).grd',
               ],
               'outputs': [
-                '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.h',
-                '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
+                '<(gen_dir)/installer_util_strings.h',
+                '<(gen_dir)/installer_util_strings.rc',
               ],
               'action': ['python',
                          '<(create_string_rc_py)',
                          '-i', 'app/<(brand_strings).grd:resources',
                          '-n', 'installer_util_strings',
-                         '-o', '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',],
+                         '-o', '<(gen_dir)',],
               'message': 'Generating installer_util_strings',
             },
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',
+              '<(SHARED_INTERMEDIATE_DIR)',
             ],
           },
         },
         {
           # GN version: //chrome/installer/launcher_support
           'target_name': 'launcher_support',
           'type': 'static_library',
           'include_dirs': [
             '..',
           ],
@@ skipping 27 matching lines @@
             '..',
             '<(INTERMEDIATE_DIR)',
             '<(SHARED_INTERMEDIATE_DIR)/setup',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/setup',
             ],
           },
           'sources': [
-            '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_strings.rc',
             'installer/mini_installer/chrome.release',
             'installer/setup/app_launcher_installer.cc',
             'installer/setup/app_launcher_installer.h',
             'installer/setup/archive_patch_helper.cc',
             'installer/setup/archive_patch_helper.h',
             'installer/setup/install.cc',
             'installer/setup/install.h',
             'installer/setup/install_worker.cc',
             'installer/setup/install_worker.h',
             'installer/setup/setup.ico',
@@ skipping 819 matching lines @@
             '..',
           ],
           'sources': [
             'installer/gcapi_mac/gcapi_example_client.mm',
           ],
         },
       ],  # targets
     }],  # OS=="mac"
   ],
 }