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

chrome/chrome_installer_util.gypi

 # Copyright (c) 2010 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': [
       # This part is shared between the two versions of the target.
       ['installer_util_target==1', {
         'sources': [
           'installer/util/browser_distribution.cc',
           'installer/util/browser_distribution.h',
           'installer/util/channel_info.cc',
           'installer/util/channel_info.h',
           'installer/util/chrome_frame_distribution.cc',
           'installer/util/chrome_frame_distribution.h',
+          'installer/util/chromium_binaries_distribution.cc',
+          'installer/util/chromium_binaries_distribution.h',
           'installer/util/conditional_work_item_list.cc',
           'installer/util/conditional_work_item_list.h',
           'installer/util/copy_tree_work_item.cc',
           'installer/util/copy_tree_work_item.h',
           'installer/util/create_dir_work_item.cc',
           'installer/util/create_dir_work_item.h',
           'installer/util/create_reg_key_work_item.cc',
           'installer/util/create_reg_key_work_item.h',
           'installer/util/delete_reg_key_work_item.cc',
           'installer/util/delete_reg_key_work_item.h',
           'installer/util/delete_reg_value_work_item.cc',
           'installer/util/delete_reg_value_work_item.h',
           'installer/util/delete_tree_work_item.cc',
           'installer/util/delete_tree_work_item.h',
+          'installer/util/google_chrome_binaries_distribution.cc',
+          'installer/util/google_chrome_binaries_distribution.h',
           'installer/util/google_chrome_sxs_distribution.cc',
           'installer/util/google_chrome_sxs_distribution.h',
           'installer/util/google_update_constants.cc',
           'installer/util/google_update_constants.h',
           'installer/util/google_update_settings.cc',
           'installer/util/google_update_settings.h',
           'installer/util/helper.cc',
           'installer/util/helper.h',
           'installer/util/install_util.cc',
           'installer/util/install_util.h',
           'installer/util/installation_state.h',
           'installer/util/installation_state.cc',
           'installer/util/installer_state.h',
           'installer/util/installer_state.cc',
           'installer/util/l10n_string_util.cc',
           'installer/util/l10n_string_util.h',
           'installer/util/language_selector.cc',
           'installer/util/language_selector.h',
           'installer/util/master_preferences_constants.cc',
           'installer/util/master_preferences_constants.h',
           'installer/util/move_tree_work_item.cc',
           'installer/util/move_tree_work_item.h',
-          'installer/util/package.h',
-          'installer/util/package.cc',
-          'installer/util/package_properties.h',
-          'installer/util/package_properties.cc',
           'installer/util/self_reg_work_item.cc',
           'installer/util/self_reg_work_item.h',
           'installer/util/set_reg_value_work_item.cc',
           'installer/util/set_reg_value_work_item.h',
           'installer/util/util_constants.cc',
           'installer/util/util_constants.h',
           'installer/util/wmi.cc',
           'installer/util/wmi.h',
           'installer/util/work_item.cc',
           'installer/util/work_item.h',
@@ skipping 22 matching lines @@
             'common_constants',
             'chrome_resources',
             'chrome_strings',
             '<(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',
+            'installer/util/chrome_browser_sxs_operations.h',
+            'installer/util/chrome_frame_operations.cc',
+            'installer/util/chrome_frame_operations.h',
             'installer/util/compat_checks.cc',
             'installer/util/compat_checks.h',
             'installer/util/delete_after_reboot_helper.cc',
             'installer/util/delete_after_reboot_helper.h',
             'installer/util/google_chrome_distribution.cc',
             'installer/util/google_chrome_distribution.h',
             'installer/util/html_dialog.h',
             'installer/util/html_dialog_impl.cc',
             'installer/util/logging_installer.cc',
             'installer/util/logging_installer.h',
             'installer/util/lzma_util.cc',
             'installer/util/lzma_util.h',
             '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/shell_util.cc',
             'installer/util/shell_util.h',
           ],
         },
         {
           'target_name': 'installer_util_nacl_win64',
           'type': '<(library)',
           'msvs_guid': '91016F29-C324-4236-8AA0-032765E71582',
           'variables': {
             'installer_util_target': 1,
@@ skipping 40 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: