Trying to re-land r17758

chrome/installer/installer.gyp

Index: chrome/installer/installer.gyp
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index 807fb47757c303b6b7d5b4d962946a10db16d3b3..170a0548902074f5e54e151d186a04e94cf6fbe8 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -238,10 +238,10 @@
           ],
         },
         {
-          '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',
@@ -261,8 +261,8 @@
             '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',
@@ -546,6 +546,24 @@
             }],
           ],
         },
+        {
+          '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"', {