More installer refactoring in the interest of fixing some bugs and cleaning t...

chrome/chrome_installer.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.
 
 {
   'variables': {
     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
   'conditions': [
@@ skipping 68 matching lines @@
             'installer/util/browser_distribution_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',
             'installer/util/delete_reg_value_work_item_unittest.cc',
             'installer/util/delete_tree_work_item_unittest.cc',
             'installer/util/google_chrome_distribution_unittest.cc',
             'installer/util/google_update_settings_unittest.cc',
-            'installer/util/helper_unittest.cc',
             'installer/util/install_util_unittest.cc',
+            'installer/util/installer_state_unittest.cc',
             'installer/util/installer_util_unittests.rc',
             'installer/util/installer_util_unittests_resource.h',
             'installer/util/language_selector_unittest.cc',
             'installer/util/lzma_util_unittest.cc',
             'installer/util/master_preferences_unittest.cc',
             'installer/util/move_tree_work_item_unittest.cc',
-            'installer/util/package_properties_unittest.cc',
-            'installer/util/package_unittest.cc',
             'installer/util/product_unittest.h',
             'installer/util/product_unittest.cc',
+            'installer/util/product_state_unittest.cc',
             'installer/util/run_all_unittests.cc',
             'installer/util/set_reg_value_work_item_unittest.cc',
             'installer/util/shell_util_unittest.cc',
             'installer/util/wmi_unittest.cc',
             'installer/util/work_item_list_unittest.cc',
           ],
           'msvs_settings': {
             'VCManifestTool': {
               'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest',
             },
@@ skipping 191 matching lines @@
               },
             }],
           ],
         },
         {
           'target_name': 'setup_unittests',
           'type': 'executable',
           'msvs_guid': 'C0AE4E06-F023-460F-BC14-6302CEAC51F8',
           'dependencies': [
             'installer_util',
+            'installer_util_strings',
             '<(DEPTH)/base/base.gyp:base',
             '<(DEPTH)/base/base.gyp:base_i18n',
             '<(DEPTH)/base/base.gyp:test_support_base',
             '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
             '<(DEPTH)/testing/gmock.gyp:gmock',
             '<(DEPTH)/testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '<(DEPTH)',
           ],
           # TODO(robertshield): Move the items marked with "Move to lib"
           # below into a separate lib and then link both setup.exe and
           # setup_unittests.exe against that.
           'sources': [
             'installer/setup/install_worker.cc',    # Move to lib
             'installer/setup/install_worker.h',     # Move to lib
             'installer/setup/install_worker_unittest.cc',
             'installer/setup/run_all_unittests.cc',
             'installer/setup/setup_constants.cc',   # Move to lib
             'installer/setup/setup_constants.h',    # Move to lib
+            'installer/setup/setup_unittests.rc',
+            'installer/setup/setup_unittests.rc',
+            'installer/setup/setup_unittests_resource.h',
             'installer/setup/setup_util.cc',
             'installer/setup/setup_util_unittest.cc',
           ],
         },
       ],
     }],
     ['OS=="linux" and branding=="Chrome"', {
       'variables': {
         # Always google_chrome since this only applies to branding==Chrome.
         'branding_dir': 'app/theme/google_chrome',
@@ skipping 541 matching lines @@
       },
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: