Trying to re-land r17758

chrome/installer/installer.gyp

 {
   'variables': {
     'version_py': '../../chrome/tools/build/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
   'includes': [
     '../../build/common.gypi',
   ],
@@ skipping 220 matching lines @@
           'include_dirs': [
             '../..',
           ],
           'sources': [
             'gcapi/gcapi_test.cc',
             'gcapi/gcapi_test.rc',
             'gcapi/resource.h',
           ],
         },
         {
-          'target_name': 'installer_unittests',
+          'target_name': 'installer_util_unittests',
           'type': 'executable',
           'msvs_guid': '903F8C1E-537A-4C9E-97BE-075147CBE769',
-          'msvs_existing_vcproj': 'util/installer_unittests.vcproj',
+          'msvs_existing_vcproj': 'util/installer_util_unittests.vcproj',
           'dependencies': [
             'installer_util',
             'installer_util_strings',
             '../../base/base.gyp:base',
             '../../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '../..',
           ],
           'sources': [
             'setup/compat_checks_unittest.cc',
             'setup/setup_constants.cc',
             'util/copy_tree_work_item_unittest.cc',
             'util/create_dir_work_item_unittest.cc',
             'util/create_reg_key_work_item_unittest.cc',
             'util/delete_reg_value_work_item_unittest.cc',
             'util/delete_tree_work_item_unittest.cc',
             'util/google_chrome_distribution_unittest.cc',
             'util/helper_unittest.cc',
-            'util/installer_unittests.rc',
-            'util/installer_unittests_resource.h',
+            'util/installer_util_unittests.rc',
+            'util/installer_util_unittests_resource.h',
             'util/move_tree_work_item_unittest.cc',
             'util/run_all_unittests.cc',
             'util/set_reg_value_work_item_unittest.cc',
             'util/work_item_list_unittest.cc',
           ],
         },
         {
           'target_name': 'installer_util_strings',
           'type': 'none',
           'msvs_guid': '0026A376-C4F1-4575-A1BA-578C69F07013',
@@ skipping 263 matching lines @@
               'variables': {
                  'branding_dir': '../app/theme/google_chrome',
               },
             }, { # else branding!="Chrome"
               'variables': {
                  'branding_dir': '../app/theme/chromium',
               },
             }],
           ],
         },
+        {
+          'target_name': 'setup_unittests',
+          'type': 'executable',
+          'msvs_guid': 'C0AE4E06-F023-460F-BC14-6302CEAC51F8',
+          'dependencies': [
+            'installer_util',
+            '../../base/base.gyp:base',
+            '../../testing/gtest.gyp:gtest',
+          ],
+          'include_dirs': [
+            '../..',
+          ],
+          'sources': [
+            'setup/run_all_unittests.cc',
+            'setup/setup_util.cc',
+            'setup/setup_util_unittest.cc',
+          ],
+        },
       ],
     }],
     [ 'branding == "Chrome"', {
       'variables': {
          'branding_dir': '../app/theme/google_chrome',
       },
     }, { # else branding!="Chrome"
       'variables': {
          'branding_dir': '../app/theme/chromium',
       },
     }],
   ],
 }