• Home
  • History
  • Annotate
  • only in /external/chromium_org/chrome/installer/
History log of /external/chromium_org/chrome/installer/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
78901d17b47ef1f8d6d0a89eaf37f9523ba1de85 08-Dec-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: I6695b44b7c48580907460fb1a183c166e6ab505f
etup/setup_main.cc
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_settings_unittest.cc
1675a649fd7a8b3cb80ffddae2dc181f122353c5 22-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.37

This commit was generated by merge_to_master.py.

Change-Id: I4ca18a1d6d089e98b0511ad83f49e89d62401760
ac/sign_app.sh.in
ac/sign_versioned_dir.sh.in
34680572440d7894ef8dafce81d8039ed80726a2 14-Oct-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 39.0.2171.26

This commit was generated by merge_to_master.py.

Change-Id: I7e2a210cf0e24a4fbfd446a03aab3b29edbdd13a
etup/install_worker.cc
til/installation_validator.cc
til/installation_validator.h
til/installation_validator_unittest.cc
til/util_constants.cc
til/util_constants.h
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
capi/gcapi.cc
capi/gcapi.h
capi/gcapi_last_run_test.cc
capi/gcapi_test.cc
capi/gcapi_test_registry_overrider.cc
auncher_support/chrome_launcher_support.cc
inux/debian/build.sh
inux/sysroot_scripts/install-debian.wheezy.sysroot.py
ac/app_resource_rules.plist.in
ini_installer/chrome.release
ini_installer/mini_installer.cc
etup/archive_patch_helper.cc
etup/archive_patch_helper_unittest.cc
etup/install.cc
etup/install_unittest.cc
etup/install_worker.cc
etup/setup_main.cc
etup/setup_util.cc
etup/setup_util_unittest.cc
etup/uninstall.cc
est/alternate_version_generator.cc
est/alternate_version_generator_main.cc
est/upgrade_test.cc
ools/validate_installation_main.cc
til/channel_info.cc
til/channel_info_unittest.cc
til/chrome_browser_operations.cc
til/conditional_work_item_list.cc
til/copy_tree_work_item.cc
til/copy_tree_work_item_unittest.cc
til/create_dir_work_item.cc
til/create_dir_work_item_unittest.cc
til/delete_after_reboot_helper.cc
til/delete_after_reboot_helper_unittest.cc
til/delete_tree_work_item.cc
til/delete_tree_work_item_unittest.cc
til/duplicate_tree_detector.cc
til/duplicate_tree_detector_unittest.cc
til/eula_util.cc
til/google_update_settings_unittest.cc
til/google_update_util.cc
til/install_util.cc
til/install_util_unittest.cc
til/installer_state.cc
til/installer_state_unittest.cc
til/logging_installer.cc
til/logging_installer_unittest.cc
til/lzma_util.cc
til/lzma_util_unittest.cc
til/master_preferences.cc
til/master_preferences_unittest.cc
til/move_tree_work_item.cc
til/move_tree_work_item_unittest.cc
til/product.cc
til/product_state_unittest.cc
til/product_unittest.cc
til/self_cleaning_temp_dir.cc
til/self_cleaning_temp_dir_unittest.cc
til/shell_util.cc
til/shell_util_unittest.cc
til/user_experiment.cc
til/util_constants.cc
til/util_constants.h
til/work_item_list_unittest.cc
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
til/BUILD.gn
til/delete_tree_work_item_unittest.cc
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
capi/gcapi.cc
etup/install.cc
etup/install_unittest.cc
til/google_update_settings.h
til/language_selector.cc
til/shell_util.cc
til/shell_util_unittest.cc
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
auncher_support/chrome_launcher_support.cc
auncher_support/chrome_launcher_support.h
inux/common/installer.include
inux/debian/build.sh
inux/rpm/build.sh
inux/sysroot_scripts/packagelist.wheezy.arm
ac/app_resource_rules.plist.in
ini_installer.gyp
ini_installer.gypi
ini_installer/chrome.release
etup/install.cc
etup/install.h
etup/install_worker.cc
etup/install_worker.h
etup/setup_constants.cc
etup/setup_constants.h
etup/setup_main.cc
etup/uninstall.cc
til/DEPS
til/chrome_app_host_distribution.cc
til/google_update_constants.cc
til/google_update_constants.h
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_util.cc
til/google_update_util.h
til/util_constants.cc
til/util_constants.h
til/work_item_list_unittest.cc
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
capi/gcapi.cc
inux/debian/build.sh
inux/debian/expected_deps
inux/debian/expected_deps_ia32
inux/debian/expected_deps_x64
inux/rpm/expected_deps_i386
inux/rpm/expected_deps_x86_64
ini_installer.gyp
ini_installer.gypi
ini_installer/exit_code.h
ini_installer/mini_installer.cc
ini_installer/mini_installer.h
ini_installer/mini_installer_constants.cc
ini_installer/mini_installer_constants.h
etup/DEPS
etup/install_worker.cc
etup/setup_util.cc
etup/uninstall.cc
est/pe_image_resources.cc
til/chrome_app_host_distribution.cc
til/chrome_frame_distribution.cc
til/chromium_binaries_distribution.cc
til/delete_after_reboot_helper_unittest.cc
til/google_chrome_binaries_distribution.cc
til/google_chrome_distribution.cc
til/google_chrome_distribution_dummy.cc
til/google_chrome_sxs_distribution.cc
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_settings_unittest.cc
til/language_selector.cc
til/shell_util.cc
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
inux/debian/expected_deps
inux/rpm/build.sh
etup/setup_main.cc
til/run_all_unittests.cc
til/util_constants.h
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
inux/common/wrapper
est/alternate_version_generator.cc
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_settings_unittest.cc
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
capi/gcapi.cc
capi/gcapi_last_run_test.cc
capi/gcapi_omaha_experiment.cc
capi/gcapi_omaha_experiment_test.cc
capi/gcapi_reactivation.cc
capi/gcapi_reactivation_test.cc
inux/common/rpm.include
inux/common/wrapper
inux/debian/build.sh
inux/debian/expected_deps
inux/rpm/expected_deps_i386
inux/rpm/expected_deps_x86_64
inux/sysroot_scripts/packagelist.debian.wheezy.amd64
inux/sysroot_scripts/packagelist.debian.wheezy.i386
inux/sysroot_scripts/packagelist.trusty.arm
inux/sysroot_scripts/packagelist.wheezy.amd64
inux/sysroot_scripts/packagelist.wheezy.arm
inux/sysroot_scripts/packagelist.wheezy.i386
inux/sysroot_scripts/sysroot-creator-debian.wheezy.sh
inux/sysroot_scripts/sysroot-creator-test.sh
inux/sysroot_scripts/sysroot-creator-trusty.sh
inux/sysroot_scripts/sysroot-creator-wheezy.sh
inux/sysroot_scripts/sysroot-creator.sh
ac/third_party/bsdiff/README.chromium
ac/third_party/bsdiff/goobspatch.c
ini_installer/configuration.cc
ini_installer/configuration.h
ini_installer/mini_installer.cc
etup/install.cc
etup/install_unittest.cc
etup/install_worker.cc
etup/install_worker_unittest.cc
etup/setup_main.cc
etup/uninstall.cc
til/app_command.cc
til/app_registration_data.h
til/browser_distribution.cc
til/browser_distribution.h
til/chrome_app_host_distribution.cc
til/chrome_app_host_distribution.h
til/chrome_frame_distribution.cc
til/chrome_frame_distribution.h
til/chromium_binaries_distribution.cc
til/chromium_binaries_distribution.h
til/compat_checks.cc
til/copy_reg_key_work_item.cc
til/copy_reg_key_work_item.h
til/copy_reg_key_work_item_unittest.cc
til/create_reg_key_work_item.cc
til/create_reg_key_work_item.h
til/create_reg_key_work_item_unittest.cc
til/delete_reg_key_work_item.cc
til/delete_reg_key_work_item.h
til/delete_reg_key_work_item_unittest.cc
til/delete_reg_value_work_item.cc
til/delete_reg_value_work_item.h
til/delete_reg_value_work_item_unittest.cc
til/google_chrome_binaries_distribution.cc
til/google_chrome_binaries_distribution.h
til/google_chrome_distribution.cc
til/google_chrome_distribution.h
til/google_chrome_distribution_dummy.cc
til/google_chrome_sxs_distribution.cc
til/google_update_experiment_util.cc
til/google_update_experiment_util.h
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_settings_unittest.cc
til/helper.cc
til/install_util.cc
til/install_util.h
til/install_util_unittest.cc
til/installation_state.cc
til/installer_state.cc
til/master_preferences_dummy.cc
til/non_updating_app_registration_data.cc
til/non_updating_app_registration_data.h
til/product.cc
til/registry_key_backup.cc
til/registry_key_backup.h
til/registry_key_backup_unittest.cc
til/set_reg_value_work_item.cc
til/set_reg_value_work_item.h
til/set_reg_value_work_item_unittest.cc
til/shell_util.cc
til/updating_app_registration_data.cc
til/updating_app_registration_data.h
til/work_item.cc
til/work_item.h
til/work_item_list.cc
til/work_item_list.h
til/work_item_list_unittest.cc
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
etup/DEPS
etup/setup_main.cc
etup/uninstall.cc
til/auto_launch_util.cc
til/helper.cc
til/helper.h
til/installer_state.cc
til/product.cc
til/product.h
til/product_unittest.cc
til/user_experiment.cc
til/util_constants.cc
til/util_constants.h
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
etup/install_worker.cc
etup/uninstall.cc
til/firewall_manager_win.cc
til/prebuild/create_string_rc.py
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
inux/sysroot_scripts/install-debian.wheezy.sysroot.py
inux/sysroot_scripts/packagelist.debian.wheezy.amd64
inux/sysroot_scripts/packagelist.debian.wheezy.i386
inux/sysroot_scripts/sysroot-creator-debian.wheezy.sh
etup/setup_main.cc
til/advanced_firewall_manager_win.cc
til/advanced_firewall_manager_win.h
til/advanced_firewall_manager_win_unittest.cc
til/eula_util.cc
til/firewall_manager_win.cc
til/firewall_manager_win.h
til/helper.cc
til/install_util.cc
til/install_util.h
til/legacy_firewall_manager_win.cc
til/legacy_firewall_manager_win.h
til/legacy_firewall_manager_win_unittest.cc
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
ini_installer.gypi
ini_installer/chrome.release
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
etup/uninstall.cc
til/auto_launch_util.cc
til/helper.cc
til/helper.h
til/install_util.cc
til/product.cc
til/product.h
til/product_unittest.cc
til/user_experiment.cc
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
inux/common/installer.include
inux/rpm/build.sh
ini_installer.gyp
ini_installer.gypi
ini_installer/chrome.release
etup/setup_main.cc
til/html_dialog.h
til/html_dialog_impl.cc
4ad1aa43a48567659193a298fad74f55e00b3dd9 01-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260540

This commit was generated by merge_to_master.py.

Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
inux/common/wrapper
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
inux/common/installer.include
inux/common/postinst.include
inux/common/prerm.include
inux/rpm/build.sh
inux/rpm/expected_deps_i386
inux/rpm/expected_deps_x86_64
inux/sysroot_scripts/install-debian.wheezy.sysroot.py
inux/sysroot_scripts/packagelist.debian.wheezy.amd64
inux/sysroot_scripts/packagelist.debian.wheezy.i386
inux/sysroot_scripts/sysroot-creator-debian.wheezy.sh
etup/install.cc
etup/setup_main.cc
til/eula_util.cc
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_settings_unittest.cc
til/google_update_util.cc
til/google_update_util.h
til/install_util.cc
til/install_util.h
til/util_constants.cc
til/util_constants.h
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
auncher_support/chrome_launcher_support.cc
auncher_support/chrome_launcher_support.h
inux/common/installer.include
inux/rpm/expected_deps_i386
inux/rpm/expected_deps_x86_64
ini_installer.gyp
ini_installer.gypi
ini_installer/chrome.release
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
nstaller_tools.gyp
inux/debian/build.sh
inux/debian/expected_deps
ac/dmgdiffer.sh
ac/keystone_install.sh
ini_installer.gyp
ini_installer/mini_installer_exe_version.rc.version
ini_installer_syzygy.gyp
etup/install.cc
etup/install_unittest.cc
etup/install_worker.cc
etup/install_worker.h
etup/setup.vcproj
etup/setup.vsprops
etup/setup_debug.vsprops
etup/setup_exe_version.rc.version
etup/setup_main.cc
etup/setup_main.h
etup/setup_release.vsprops
etup/setup_util.cc
etup/setup_util.h
etup/setup_util_unittest.cc
etup/uninstall.cc
etup/uninstall.h
est/alternate_version_generator.cc
pgrade_test.gyp
til/browser_distribution.cc
til/chrome_app_host_operations.h
til/chrome_binaries_operations.h
til/chrome_browser_operations.h
til/chrome_browser_sxs_operations.h
til/chrome_frame_operations.h
til/eula_util.cc
til/fake_product_state.h
til/google_chrome_distribution.cc
til/google_chrome_sxs_distribution.cc
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_util.cc
til/google_update_util.h
til/helper.cc
til/install_util.cc
til/install_util.h
til/install_util_unittest.cc
til/installation_state.cc
til/installation_state.h
til/installation_validator.h
til/installer_state.cc
til/installer_state.h
til/installer_state_unittest.cc
til/logging_installer.cc
til/logging_installer_unittest.cc
til/master_preferences.h
til/master_preferences_unittest.cc
til/move_tree_work_item_unittest.cc
til/product.h
til/product_operations.h
til/self_cleaning_temp_dir_unittest.cc
til/shell_util.cc
til/shell_util.h
til/shell_util_unittest.cc
til/user_experiment.cc
til/user_experiment.h
til/util_constants.cc
til/util_constants.h
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
EPS
capi/gcapi_last_run_test.cc
capi/gcapi_omaha_experiment.cc
capi/gcapi_omaha_experiment.h
capi/gcapi_omaha_experiment_test.cc
capi/gcapi_reactivation_test.cc
auncher_support/chrome_launcher_support.cc
inux/common/installer.include
inux/common/wrapper
inux/debian/build.sh
inux/debian/expected_deps
inux/rpm/expected_deps_i386
inux/rpm/expected_deps_x86_64
ac/keystone_install.sh
ini_installer.gyp
ini_installer.gypi
ini_installer/chrome.release
etup/archive_patch_helper.cc
etup/cf_migration.cc
etup/cf_migration.h
etup/chrome_frame_quick_enable.cc
etup/chrome_frame_quick_enable.h
etup/chrome_frame_ready_mode.cc
etup/chrome_frame_ready_mode.h
etup/install.cc
etup/install.h
etup/install_unittest.cc
etup/install_worker.cc
etup/install_worker.h
etup/install_worker_unittest.cc
etup/setup.rc
etup/setup_exe_version.rc.version
etup/setup_main.cc
etup/setup_main.h
etup/setup_util.cc
etup/setup_util.h
etup/setup_util_unittest.cc
etup/uninstall.cc
etup/uninstall.h
ools/setup_timer.py
til/app_command.cc
til/app_command.h
til/auto_launch_util.cc
til/auto_launch_util.h
til/browser_distribution.cc
til/browser_distribution.h
til/chrome_app_host_distribution.cc
til/chrome_app_host_distribution.h
til/chrome_app_host_operations.cc
til/chrome_app_host_operations.h
til/chrome_binaries_operations.cc
til/chrome_binaries_operations.h
til/chrome_browser_operations.cc
til/chrome_browser_operations.h
til/chrome_browser_sxs_operations.cc
til/chrome_browser_sxs_operations.h
til/chrome_frame_distribution.cc
til/chrome_frame_distribution.h
til/chrome_frame_operations.cc
til/chrome_frame_operations.h
til/chromium_binaries_distribution.cc
til/chromium_binaries_distribution.h
til/duplicate_tree_detector.cc
til/duplicate_tree_detector_unittest.cc
til/google_chrome_binaries_distribution.cc
til/google_chrome_binaries_distribution.h
til/google_chrome_distribution.cc
til/google_chrome_distribution.h
til/google_chrome_distribution_dummy.cc
til/google_chrome_sxs_distribution.cc
til/google_chrome_sxs_distribution.h
til/google_update_experiment_util.cc
til/google_update_experiment_util.h
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_settings_unittest.cc
til/google_update_util.cc
til/install_util.cc
til/install_util.h
til/installation_validator.cc
til/installation_validator.h
til/installation_validator_unittest.cc
til/installer_state.cc
til/installer_state_unittest.cc
til/installer_util_test_common.cc
til/l10n_string_util.cc
til/l10n_string_util.h
til/logging_installer.cc
til/master_preferences.cc
til/master_preferences.h
til/master_preferences_constants.cc
til/master_preferences_constants.h
til/master_preferences_unittest.cc
til/prebuild/create_string_rc.py
til/product_operations.h
til/product_unittest.cc
til/self_cleaning_temp_dir_unittest.cc
til/shell_util.cc
til/shell_util.h
til/shell_util_unittest.cc
til/uninstall_metrics.cc
til/uninstall_metrics.h
til/uninstall_metrics_unittest.cc
til/user_experiment.cc
til/user_experiment.h
til/util_constants.cc
til/util_constants.h
til/wmi.cc
til/wmi.h
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
capi/gcapi_omaha_experiment.cc
capi/gcapi_omaha_experiment_test.cc
capi/gcapi_reactivation_test.cc
etup/install.cc
etup/install_unittest.cc
etup/setup_main.cc
etup/setup_util_unittest.cc
etup/uninstall.cc
est/alternate_version_generator.cc
est/upgrade_test.cc
ools/validate_installation_main.cc
til/browser_distribution.cc
til/browser_distribution.h
til/copy_tree_work_item_unittest.cc
til/create_dir_work_item.cc
til/create_dir_work_item_unittest.cc
til/delete_after_reboot_helper_unittest.cc
til/delete_tree_work_item_unittest.cc
til/duplicate_tree_detector.cc
til/duplicate_tree_detector_unittest.cc
til/google_chrome_sxs_distribution.cc
til/google_chrome_sxs_distribution.h
til/google_update_constants.cc
til/google_update_constants.h
til/google_update_experiment_util.cc
til/google_update_experiment_util.h
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_settings_unittest.cc
til/install_util.cc
til/install_util_unittest.cc
til/installer_state.cc
til/installer_state.h
til/installer_state_unittest.cc
til/logging_installer.cc
til/logging_installer_unittest.cc
til/lzma_util.cc
til/lzma_util_unittest.cc
til/master_preferences_unittest.cc
til/move_tree_work_item_unittest.cc
til/prebuild/create_string_rc.py
til/self_cleaning_temp_dir.cc
til/shell_util.cc
til/shell_util.h
til/shell_util_unittest.cc
til/util_constants.cc
til/util_constants.h
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
capi/gcapi_omaha_experiment.cc
capi/gcapi_omaha_experiment.h
capi/gcapi_omaha_experiment_test.cc
capi/gcapi_reactivation_test.cc
capi/gcapi_test.cc
capi/gcapi_test_registry_overrider.cc
capi/gcapi_test_registry_overrider.h
inux/common/installer.include
inux/common/postinst.include
inux/common/prerm.include
inux/debian/build.sh
inux/debian/expected_deps
inux/rpm/build.sh
inux/rpm/chrome.spec.template
inux/rpm/expected_deps_i386
inux/rpm/expected_deps_x86_64
inux/sysroot_scripts/sysroot-creator-debian.wheezy.sh
ini_installer.gypi
ini_installer/chrome.release
etup/install.cc
etup/install_worker.cc
etup/setup_util.cc
etup/setup_util_unittest.cc
est/alternate_version_generator.cc
til/browser_distribution.cc
til/browser_distribution.h
til/google_chrome_distribution.cc
til/google_chrome_distribution.h
til/google_chrome_distribution_dummy.cc
til/google_update_constants.cc
til/google_update_constants.h
til/google_update_experiment_util.cc
til/google_update_experiment_util.h
til/google_update_util.cc
til/product_state_unittest.cc
til/shell_util.cc
til/shell_util.h
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
inux/sysroot_scripts/install-debian.wheezy.sysroot.py
inux/sysroot_scripts/packagelist.debian.wheezy.amd64
inux/sysroot_scripts/packagelist.debian.wheezy.i386
inux/sysroot_scripts/sysroot-creator-debian.wheezy.sh
etup/install.cc
til/browser_distribution.cc
til/browser_distribution.h
til/google_chrome_distribution.cc
til/google_chrome_distribution.h
til/google_chrome_distribution_dummy.cc
til/master_preferences.cc
til/master_preferences.h
til/master_preferences_unittest.cc
til/shell_util.cc
til/shell_util.h
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
inux/rpm/expected_deps_i386
inux/rpm/expected_deps_x86_64
ac/dirdiffer.sh
ac/dirpatcher.sh
etup/uninstall.cc
til/browser_distribution.cc
til/browser_distribution.h
til/chrome_app_host_distribution.cc
til/chrome_app_host_distribution.h
til/chrome_frame_distribution.cc
til/chrome_frame_distribution.h
til/chromium_binaries_distribution.cc
til/chromium_binaries_distribution.h
til/google_chrome_sxs_distribution.cc
til/google_chrome_sxs_distribution.h
til/helper.cc
til/prebuild/create_string_rc.py
til/shell_util.cc
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
etup/setup_main.cc
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
inux/common/desktop.template
inux/common/installer.include
inux/common/postinst.include
inux/common/prerm.include
inux/common/updater
inux/debian/build.sh
inux/debian/postinst
inux/debian/postrm
inux/debian/prerm
inux/rpm/build.sh
inux/rpm/chrome.spec.template
ini_installer/chrome.release
etup/setup_main.cc
etup/setup_util.cc
etup/setup_util.h
etup/uninstall.cc
etup/uninstall.h
til/create_reg_key_work_item.cc
til/google_update_settings.cc
til/google_update_settings.h
til/install_util.cc
til/installer_state.cc
til/installer_state.h
til/util_constants.h
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
capi_mac/gcapi.mm
inux/debian/build.sh
etup/cf_migration.cc
etup/cf_migration.h
etup/install.cc
etup/setup_main.cc
etup/setup_main.h
etup/uninstall.cc
til/channel_info.cc
til/channel_info.h
til/channel_info_unittest.cc
til/delete_after_reboot_helper.cc
til/delete_after_reboot_helper.h
til/delete_after_reboot_helper_unittest.cc
til/self_cleaning_temp_dir.cc
til/shell_util.cc
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
inux/common/installer.include
inux/common/wrapper
inux/debian/build.sh
inux/debian/expected_deps
inux/rpm/expected_deps_i386
inux/rpm/expected_deps_x86_64
ini_installer.gyp
ini_installer/chrome.release
ini_installer_tests.isolate
etup/uninstall.cc
til/browser_distribution.cc
til/browser_distribution.h
til/chrome_app_host_distribution.cc
til/chrome_app_host_distribution.h
til/chrome_frame_distribution.cc
til/chrome_frame_distribution.h
til/chromium_binaries_distribution.cc
til/chromium_binaries_distribution.h
til/google_chrome_distribution.cc
til/google_chrome_distribution.h
til/google_chrome_distribution_dummy.cc
til/google_chrome_sxs_distribution.cc
til/google_chrome_sxs_distribution.h
til/install_util.cc
til/shell_util.cc
til/shell_util.h
til/shell_util_unittest.cc
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
WNERS
ini_installer.gyp
ini_installer.gypi
ini_installer/chrome.release
etup/install_unittest.cc
etup/uninstall.cc
til/master_preferences.cc
til/shell_util.cc
til/shell_util.h
til/shell_util_unittest.cc
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
ini_installer/chrome.release
ini_installer/mini_installer.cc
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
capi/gcapi.cc
capi/gcapi.def
capi/gcapi.h
capi/gcapi_omaha_experiment.cc
capi/gcapi_omaha_experiment.h
capi/gcapi_reactivation_test.cc
inux/common/installer.include
inux/debian/expected_deps
inux/rpm/expected_deps_i386
inux/rpm/expected_deps_x86_64
ini_installer.gyp
ini_installer.gypi
ini_installer/mini_installer.exe.manifest
etup/install.cc
etup/install_unittest.cc
etup/install_worker.cc
etup/setup_main.cc
etup/setup_util.cc
etup/uninstall.cc
til/browser_distribution.cc
til/browser_distribution.h
til/chrome_app_host_distribution.cc
til/chrome_app_host_distribution.h
til/chrome_app_host_operations.cc
til/chrome_browser_operations.cc
til/chrome_frame_distribution.cc
til/chrome_frame_distribution.h
til/chromium_binaries_distribution.cc
til/chromium_binaries_distribution.h
til/google_chrome_binaries_distribution.cc
til/google_chrome_binaries_distribution.h
til/google_chrome_distribution.cc
til/google_chrome_distribution.h
til/google_chrome_distribution_dummy.cc
til/google_chrome_sxs_distribution.cc
til/google_chrome_sxs_distribution.h
til/install_util.cc
til/installation_validator.cc
til/installer_state.cc
til/prebuild/create_string_rc.py
til/product.cc
til/shell_util.cc
til/shell_util.h
til/shell_util_unittest.cc
c2db58bd994c04d98e4ee2cd7565b71548655fe3 14-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Ifa927da4997e49ab95edfc5def5ee5615a76b1be
til/shell_util.cc
til/shell_util_unittest.cc
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
etup/setup_main.cc
etup/setup_main.h
til/shell_util.cc
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
inux/debian/build.sh
inux/rpm/build.sh
til/installer_state.cc
3240926e260ce088908e02ac07a6cf7b0c0cbf44 07-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216133

This commit was generated by merge_to_master.py.

Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
etup/setup_util.cc
til/shell_util.cc
til/shell_util_unittest.cc
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
auncher_support/chrome_launcher_support.cc
auncher_support/chrome_launcher_support.h
ini_installer.gypi
ini_installer_syzygy.gyp
fb250657ef40d7500f20882d5c9909c1013367d3 31-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214456

This commit was generated by merge_to_master.py.

Change-Id: If3f38c7966c2034e96c669968f72ea1e57f41964
ini_installer/chrome.release
ini_installer/mini_installer.exe.manifest
etup/setup.exe.manifest
558790d6acca3451cf3a6b497803a5f07d0bec58 30-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1
etup/setup_main.cc
etup/setup_util.cc
etup/setup_util.h
etup/setup_util_unittest.cc
til/channel_info.cc
til/channel_info.h
til/channel_info_unittest.cc
til/util_constants.cc
til/util_constants.h
bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 25-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213605

This commit was generated by merge_to_master.py.

Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
til/installer_state.cc
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
capi/gcapi.cc
auncher_support/chrome_launcher_support.cc
etup/DEPS
etup/install.cc
etup/setup_main.cc
etup/setup_util.cc
etup/setup_util_unittest.cc
etup/uninstall.cc
est/alternate_version_generator.cc
til/copy_tree_work_item_unittest.cc
til/delete_tree_work_item_unittest.cc
til/google_update_util.cc
til/install_util.cc
til/installer_state_unittest.cc
til/lzma_util_unittest.cc
til/move_tree_work_item_unittest.cc
til/product.cc
til/user_experiment.cc
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
ini_installer.gyp
ini_installer_syzygy.gyp
etup/archive_patch_helper.cc
etup/archive_patch_helper.h
etup/archive_patch_helper_unittest.cc
etup/setup_main.cc
etup/setup_util.cc
etup/setup_util.h
etup/setup_util_unittest.cc
til/util_constants.cc
til/util_constants.h
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 18-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
ini_installer/mini_installer.exe.manifest
etup/setup.exe.manifest
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
auncher_support/chrome_launcher_support.cc
etup/install.cc
etup/install_unittest.cc
etup/install_worker.cc
etup/setup_main.cc
etup/setup_util_unittest.cc
etup/uninstall.cc
est/alternate_version_generator.cc
est/alternate_version_generator_main.cc
est/upgrade_test.cc
ools/validate_installation_main.cc
til/chrome_browser_operations.cc
til/conditional_work_item_list.cc
til/copy_tree_work_item.cc
til/copy_tree_work_item_unittest.cc
til/create_dir_work_item.cc
til/create_dir_work_item_unittest.cc
til/delete_after_reboot_helper.cc
til/delete_after_reboot_helper_unittest.cc
til/delete_tree_work_item.cc
til/delete_tree_work_item_unittest.cc
til/duplicate_tree_detector_unittest.cc
til/eula_util.cc
til/install_util.cc
til/installer_state.cc
til/installer_state_unittest.cc
til/logging_installer.cc
til/logging_installer_unittest.cc
til/lzma_util_unittest.cc
til/master_preferences.cc
til/master_preferences_dummy.cc
til/master_preferences_unittest.cc
til/move_tree_work_item.cc
til/move_tree_work_item_unittest.cc
til/self_cleaning_temp_dir.cc
til/self_cleaning_temp_dir_unittest.cc
til/shell_util.cc
til/shell_util_unittest.cc
til/work_item_list_unittest.cc
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
capi/gcapi.cc
capi/gcapi_dll.cc
capi/gcapi_last_run_test.cc
capi/gcapi_omaha_experiment.cc
capi/gcapi_reactivation.cc
capi/gcapi_reactivation_test.cc
auncher_support/chrome_launcher_support.cc
auncher_support/chrome_launcher_support.h
inux/common/installer.include
inux/debian/build.sh
inux/debian/expected_deps
inux/debian/expected_deps_ia32
inux/debian/expected_deps_x64
inux/rpm/build.sh
inux/rpm/chrome.spec.template
etup/chrome_frame_ready_mode.cc
etup/install.cc
etup/setup_main.cc
etup/setup_util.cc
etup/setup_util.h
etup/setup_util_unittest.cc
etup/uninstall.cc
est/alternate_version_generator.cc
est/upgrade_test.cc
ools/validate_installation_main.cc
til/copy_tree_work_item.cc
til/copy_tree_work_item_unittest.cc
til/delete_after_reboot_helper_unittest.cc
til/delete_tree_work_item.cc
til/google_update_experiment_util.cc
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_settings_unittest.cc
til/google_update_util.cc
til/installer_state.cc
til/logging_installer.cc
til/master_preferences.cc
til/master_preferences_unittest.cc
til/move_tree_work_item.cc
til/self_cleaning_temp_dir.cc
til/shell_util.cc
til/util_constants.cc
til/util_constants.h
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
capi/gcapi.cc
capi/gcapi_last_run_test.cc
capi/gcapi_omaha_experiment.cc
capi/gcapi_reactivation_test.cc
auncher_support/chrome_launcher_support.cc
inux/common/desktop.template
inux/debian/build.sh
inux/debian/expected_deps
inux/debian/expected_deps_ia32
inux/debian/expected_deps_x64
inux/rpm/expected_deps_i386
inux/rpm/expected_deps_x86_64
etup/chrome_frame_quick_enable.cc
etup/chrome_frame_ready_mode.cc
etup/install.cc
etup/install.h
etup/install_unittest.cc
etup/install_worker.cc
etup/setup_main.cc
etup/setup_util.cc
etup/setup_util.h
etup/uninstall.cc
etup/uninstall.h
est/alternate_version_generator.cc
til/app_command.h
til/auto_launch_util.h
til/browser_distribution.h
til/chrome_app_host_distribution.cc
til/chrome_browser_operations.cc
til/chrome_frame_distribution.cc
til/compat_checks.cc
til/copy_tree_work_item_unittest.cc
til/create_dir_work_item_unittest.cc
til/create_reg_key_work_item_unittest.cc
til/delete_after_reboot_helper.cc
til/delete_after_reboot_helper_unittest.cc
til/delete_reg_value_work_item.cc
til/delete_reg_value_work_item_unittest.cc
til/delete_tree_work_item_unittest.cc
til/duplicate_tree_detector_unittest.cc
til/google_chrome_distribution.cc
til/google_chrome_distribution.h
til/google_chrome_sxs_distribution.h
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
capi/gcapi_last_run_test.cc
capi/gcapi_reactivation_test.cc
inux/OWNERS
inux/WATCHLISTS
inux/common/apt.include
inux/common/chromium-browser/chromium-browser.info
inux/common/default-app-block.template
inux/common/default-app.template
inux/common/desktop.template
inux/common/google-chrome/google-chrome.info
inux/common/installer.include
inux/common/postinst.include
inux/common/prerm.include
inux/common/repo.cron
inux/common/rpm.include
inux/common/rpmrepo.cron
inux/common/symlinks.include
inux/common/updater
inux/common/variables.include
inux/common/wrapper
inux/debian/build.sh
inux/debian/changelog.template
inux/debian/control.template
inux/debian/debian.menu
inux/debian/expected_deps
inux/debian/postinst
inux/debian/postrm
inux/debian/prerm
inux/rpm/build.sh
inux/rpm/chrome.spec.template
inux/rpm/expected_deps_i386
inux/rpm/expected_deps_x86_64
inux/sysroot_scripts/install-debian.wheezy.sysroot.py
inux/sysroot_scripts/packagelist.debian.wheezy.amd64
inux/sysroot_scripts/packagelist.debian.wheezy.i386
inux/sysroot_scripts/sysroot-creator-debian.wheezy.sh
etup/chrome_frame_ready_mode.cc
etup/install.cc
etup/install_unittest.cc
etup/install_worker.cc
etup/run_all_unittests.cc
etup/setup_main.cc
etup/setup_util.cc
etup/setup_util.h
etup/setup_util_unittest.cc
etup/setup_util_unittest.h
etup/uninstall.cc
est/alternate_version_generator.cc
til/auto_launch_util.cc
til/delete_after_reboot_helper.cc
til/duplicate_tree_detector.cc
til/google_chrome_distribution.cc
til/google_update_experiment_util.cc
til/google_update_experiment_util.h
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_settings_unittest.cc
til/google_update_util.cc
til/install_util.cc
til/install_util.h
til/install_util_unittest.cc
til/installation_state.cc
til/installation_validator.cc
til/installation_validator.h
til/installer_state.cc
til/installer_state_unittest.cc
til/installer_util_test_common.cc
til/l10n_string_util.cc
til/l10n_string_util.h
til/language_selector.cc
til/logging_installer.cc
til/lzma_util.cc
til/master_preferences.cc
til/master_preferences_unittest.cc
til/move_tree_work_item_unittest.cc
til/product_operations.h
til/product_state_unittest.cc
til/product_unittest.cc
til/self_cleaning_temp_dir_unittest.cc
til/self_reg_work_item.cc
til/set_reg_value_work_item.cc
til/set_reg_value_work_item_unittest.cc
til/shell_util.cc
til/shell_util.h
til/shell_util_unittest.cc
til/uninstall_metrics.cc
til/uninstall_metrics.h
til/uninstall_metrics_unittest.cc
til/user_experiment.cc
til/user_experiment.h
til/wmi.h
til/work_item_list_unittest.cc
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
ini_installer/chrome.release
ini_installer_syzygy.gyp
etup/uninstall.cc
til/installation_validator.cc
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 15-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
capi/gcapi.cc
ini_installer/chrome.release
til/create_reg_key_work_item.cc
til/create_reg_key_work_item_unittest.cc
til/google_update_util.cc
til/install_util_unittest.cc
til/product_unittest.h
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
etup/install_worker.cc
etup/uninstall.cc
til/browser_distribution.cc
til/browser_distribution.h
til/chrome_app_host_distribution.cc
til/chrome_app_host_distribution.h
til/chrome_frame_distribution.cc
til/chrome_frame_distribution.h
til/google_chrome_distribution.cc
til/google_chrome_distribution.h
til/google_chrome_distribution_dummy.cc
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
capi_mac/gcapi.mm
ini_installer/chrome.release
etup/install.cc
etup/install_worker.h
etup/setup_main.cc
etup/setup_util.h
etup/setup_util_unittest.cc
etup/uninstall.cc
est/alternate_version_generator.cc
est/alternate_version_generator.h
til/delete_tree_work_item.h
til/google_chrome_distribution.cc
til/google_chrome_distribution.h
til/google_chrome_distribution_dummy.cc
til/google_chrome_distribution_unittest.cc
til/install_util.h
til/installation_state.h
til/installation_validation_helper.cc
til/installer_state.h
til/installer_state_unittest.cc
til/l10n_string_util.cc
til/master_preferences_constants.cc
til/master_preferences_constants.h
til/registry_key_backup.cc
til/shell_util.cc
til/shell_util.h
til/shell_util_unittest.cc
til/uninstall_metrics.cc
til/uninstall_metrics.h
til/uninstall_metrics_unittest.cc
til/user_experiment.cc
til/user_experiment.h
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
capi/gcapi.cc
capi/gcapi.def
capi/gcapi.h
capi/gcapi_dll.cc
capi/gcapi_last_run_test.cc
capi/gcapi_omaha_experiment.cc
capi/gcapi_omaha_experiment.h
capi/gcapi_reactivation_test.cc
capi_mac/gcapi.h
capi_mac/gcapi.mm
auncher_support/chrome_launcher_support.cc
auncher_support/chrome_launcher_support.h
ini_installer.gyp
ini_installer.gypi
ini_installer/chrome.release
ini_installer/decompress_test.cc
etup/chrome_frame_quick_enable.cc
etup/chrome_frame_ready_mode.cc
etup/install.cc
etup/install.h
etup/install_unittest.cc
etup/install_worker.cc
etup/install_worker.h
etup/install_worker_unittest.cc
etup/setup_constants.cc
etup/setup_constants.h
etup/setup_main.cc
etup/setup_util.cc
etup/setup_util.h
etup/setup_util_unittest.cc
etup/uninstall.cc
etup/uninstall.h
est/alternate_version_generator.cc
est/alternate_version_generator.h
est/alternate_version_generator_main.cc
est/resource_loader.cc
est/resource_loader.h
est/resource_updater.cc
est/resource_updater.h
est/upgrade_test.cc
ools/validate_installation_main.cc
pgrade_test.gyp
til/app_command.cc
til/app_command.h
til/auto_launch_util.cc
til/auto_launch_util.h
til/browser_distribution.cc
til/browser_distribution.h
til/channel_info.cc
til/channel_info.h
til/chrome_app_host_distribution.cc
til/chrome_app_host_distribution.h
til/chrome_app_host_operations.cc
til/chrome_app_host_operations.h
til/chrome_binaries_operations.cc
til/chrome_binaries_operations.h
til/chrome_browser_operations.cc
til/chrome_browser_operations.h
til/chrome_browser_sxs_operations.cc
til/chrome_browser_sxs_operations.h
til/chrome_frame_distribution.cc
til/chrome_frame_distribution.h
til/chrome_frame_operations.cc
til/chrome_frame_operations.h
til/compat_checks.cc
til/conditional_work_item_list.h
til/copy_tree_work_item.cc
til/copy_tree_work_item.h
til/copy_tree_work_item_unittest.cc
til/create_dir_work_item.cc
til/create_dir_work_item.h
til/create_dir_work_item_unittest.cc
til/create_reg_key_work_item.cc
til/create_reg_key_work_item_unittest.cc
til/delete_after_reboot_helper.cc
til/delete_after_reboot_helper_unittest.cc
til/delete_reg_value_work_item_unittest.cc
til/delete_tree_work_item.cc
til/delete_tree_work_item.h
til/delete_tree_work_item_unittest.cc
til/duplicate_tree_detector.cc
til/duplicate_tree_detector.h
til/duplicate_tree_detector_unittest.cc
til/eula_util.cc
til/eula_util.h
til/fake_installation_state.h
til/fake_product_state.h
til/google_chrome_distribution.cc
til/google_chrome_distribution.h
til/google_chrome_distribution_dummy.cc
til/google_chrome_sxs_distribution.cc
til/google_chrome_sxs_distribution.h
til/google_update_constants.cc
til/google_update_constants.h
til/google_update_experiment_util.cc
til/google_update_experiment_util.h
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_settings_unittest.cc
til/google_update_util.cc
til/google_update_util.h
til/helper.cc
til/helper.h
til/install_util.cc
til/install_util.h
til/install_util_unittest.cc
til/installation_state.cc
til/installation_state.h
til/installation_validator.cc
til/installation_validator.h
til/installation_validator_unittest.cc
til/installer_state.cc
til/installer_state.h
til/installer_state_unittest.cc
til/installer_util_test_common.cc
til/installer_util_test_common.h
til/logging_installer.cc
til/logging_installer.h
til/logging_installer_unittest.cc
til/lzma_util.cc
til/lzma_util.h
til/lzma_util_unittest.cc
til/master_preferences.cc
til/master_preferences.h
til/master_preferences_constants.cc
til/master_preferences_constants.h
til/master_preferences_dummy.cc
til/master_preferences_unittest.cc
til/move_tree_work_item.cc
til/move_tree_work_item.h
til/move_tree_work_item_unittest.cc
til/prebuild/create_string_rc.py
til/product.cc
til/product.h
til/product_operations.h
til/product_unittest.cc
til/product_unittest.h
til/self_cleaning_temp_dir.cc
til/self_cleaning_temp_dir.h
til/self_cleaning_temp_dir_unittest.cc
til/set_reg_value_work_item_unittest.cc
til/shell_util.cc
til/shell_util.h
til/shell_util_unittest.cc
til/user_experiment.cc
til/user_experiment.h
til/util_constants.cc
til/util_constants.h
til/work_item.cc
til/work_item.h
til/work_item_list.cc
til/work_item_list.h
til/work_item_list_unittest.cc
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
EPS
WNERS
capi/gcapi.cc
capi/gcapi.def
capi/gcapi.h
capi/gcapi_dll.cc
capi/gcapi_last_run_test.cc
capi/gcapi_omaha_experiment.cc
capi/gcapi_omaha_experiment.h
capi/gcapi_reactivation.cc
capi/gcapi_reactivation.h
capi/gcapi_reactivation_test.cc
capi/gcapi_test.cc
capi/gcapi_test.rc
capi/resource.h
capi_mac/OWNERS
capi_mac/gcapi.h
capi_mac/gcapi.mm
capi_mac/gcapi_example_client.mm
nstaller_tools.gyp
auncher_support/chrome_launcher_support.cc
auncher_support/chrome_launcher_support.h
ac/OWNERS
ac/README.chromium
ac/app_resource_rules.plist.in
ac/dirdiffer.sh
ac/dirpatcher.sh
ac/dmgdiffer.sh
ac/keystone_install.sh
ac/keystone_install_test.sh
ac/make_signers.sh
ac/pkg-dmg
ac/sign_app.sh.in
ac/sign_versioned_dir.sh.in
ac/third_party/bsdiff/LICENSE
ac/third_party/bsdiff/Makefile
ac/third_party/bsdiff/README.chromium
ac/third_party/bsdiff/bsdiff.1
ac/third_party/bsdiff/bspatch.1
ac/third_party/bsdiff/empty.cc
ac/third_party/bsdiff/goobsdiff.c
ac/third_party/bsdiff/goobsdiff.gyp
ac/third_party/bsdiff/goobspatch.c
ac/third_party/bsdiff/sha1_adapter.cc
ac/third_party/bsdiff/sha1_adapter.h
ini_installer.gyp
ini_installer.gypi
ini_installer/appid.h
ini_installer/chrome.release
ini_installer/chrome_appid.cc
ini_installer/configuration.cc
ini_installer/configuration.h
ini_installer/configuration_test.cc
ini_installer/decompress.cc
ini_installer/decompress.h
ini_installer/decompress_test.cc
ini_installer/mini_installer.cc
ini_installer/mini_installer.exe.manifest
ini_installer/mini_installer.h
ini_installer/mini_installer.ico
ini_installer/mini_installer.rc
ini_installer/mini_installer_exe_version.rc.version
ini_installer/mini_installer_resource.h
ini_installer/mini_string.cc
ini_installer/mini_string.h
ini_installer/mini_string_test.cc
ini_installer/pe_resource.cc
ini_installer/pe_resource.h
ini_installer_syzygy.gyp
etup/DEPS
etup/chrome_frame_quick_enable.cc
etup/chrome_frame_quick_enable.h
etup/chrome_frame_ready_mode.cc
etup/chrome_frame_ready_mode.h
etup/compat_checks_unittest.cc
etup/eula/oem.css
etup/eula/oem.js
etup/eula/oem_ar.html
etup/eula/oem_bg.html
etup/eula/oem_ca.html
etup/eula/oem_cs.html
etup/eula/oem_da.html
etup/eula/oem_de.html
etup/eula/oem_el.html
etup/eula/oem_en-GB.html
etup/eula/oem_en.html
etup/eula/oem_es-419.html
etup/eula/oem_es.html
etup/eula/oem_et.html
etup/eula/oem_fi.html
etup/eula/oem_fil.html
etup/eula/oem_fr.html
etup/eula/oem_hi.html
etup/eula/oem_hr.html
etup/eula/oem_hu.html
etup/eula/oem_id.html
etup/eula/oem_it.html
etup/eula/oem_iw.html
etup/eula/oem_ja.html
etup/eula/oem_ko.html
etup/eula/oem_lt.html
etup/eula/oem_lv.html
etup/eula/oem_nl.html
etup/eula/oem_no.html
etup/eula/oem_pl.html
etup/eula/oem_pt-BR.html
etup/eula/oem_pt-PT.html
etup/eula/oem_ro.html
etup/eula/oem_ru.html
etup/eula/oem_sk.html
etup/eula/oem_sl.html
etup/eula/oem_sr.html
etup/eula/oem_sv.html
etup/eula/oem_th.html
etup/eula/oem_tr.html
etup/eula/oem_uk.html
etup/eula/oem_vi.html
etup/eula/oem_zh-CN.html
etup/eula/oem_zh-TW.html
etup/install.cc
etup/install.h
etup/install_unittest.cc
etup/install_worker.cc
etup/install_worker.h
etup/install_worker_unittest.cc
etup/run_all_unittests.cc
etup/setup.exe.manifest
etup/setup.ico
etup/setup.rc
etup/setup.vcproj
etup/setup.vsprops
etup/setup_constants.cc
etup/setup_constants.h
etup/setup_debug.vsprops
etup/setup_exe_version.rc.version
etup/setup_main.cc
etup/setup_release.vsprops
etup/setup_resource.h
etup/setup_unittests.rc
etup/setup_unittests_resource.h
etup/setup_util.cc
etup/setup_util.h
etup/setup_util_unittest.cc
etup/uninstall.cc
etup/uninstall.h
est/alternate_version_generator.cc
est/alternate_version_generator.h
est/alternate_version_generator_main.cc
est/data/SETUP.EX_
est/pe_image_resources.cc
est/pe_image_resources.h
est/resource_loader.cc
est/resource_loader.h
est/resource_updater.cc
est/resource_updater.h
est/run_all_tests.cc
est/upgrade_test.cc
ools/validate_installation.rc
ools/validate_installation_main.cc
ools/validate_installation_resource.h
pgrade_test.gyp
til/app_command.cc
til/app_command.h
til/app_commands.cc
til/app_commands.h
til/auto_launch_util.cc
til/auto_launch_util.h
til/browser_distribution.cc
til/browser_distribution.h
til/callback_work_item.cc
til/callback_work_item.h
til/callback_work_item_unittest.cc
til/channel_info.cc
til/channel_info.h
til/channel_info_unittest.cc
til/chrome_app_host_distribution.cc
til/chrome_app_host_distribution.h
til/chrome_app_host_operations.cc
til/chrome_app_host_operations.h
til/chrome_binaries_operations.cc
til/chrome_binaries_operations.h
til/chrome_browser_operations.cc
til/chrome_browser_operations.h
til/chrome_browser_sxs_operations.cc
til/chrome_browser_sxs_operations.h
til/chrome_frame_distribution.cc
til/chrome_frame_distribution.h
til/chrome_frame_operations.cc
til/chrome_frame_operations.h
til/chromium_binaries_distribution.cc
til/chromium_binaries_distribution.h
til/compat_checks.cc
til/compat_checks.h
til/compat_checks_unittest.cc
til/conditional_work_item_list.cc
til/conditional_work_item_list.h
til/copy_reg_key_work_item.cc
til/copy_reg_key_work_item.h
til/copy_reg_key_work_item_unittest.cc
til/copy_tree_work_item.cc
til/copy_tree_work_item.h
til/copy_tree_work_item_unittest.cc
til/create_dir_work_item.cc
til/create_dir_work_item.h
til/create_dir_work_item_unittest.cc
til/create_reg_key_work_item.cc
til/create_reg_key_work_item.h
til/create_reg_key_work_item_unittest.cc
til/delete_after_reboot_helper.cc
til/delete_after_reboot_helper.h
til/delete_after_reboot_helper_unittest.cc
til/delete_reg_key_work_item.cc
til/delete_reg_key_work_item.h
til/delete_reg_key_work_item_unittest.cc
til/delete_reg_value_work_item.cc
til/delete_reg_value_work_item.h
til/delete_reg_value_work_item_unittest.cc
til/delete_tree_work_item.cc
til/delete_tree_work_item.h
til/delete_tree_work_item_unittest.cc
til/duplicate_tree_detector.cc
til/duplicate_tree_detector.h
til/duplicate_tree_detector_unittest.cc
til/fake_installation_state.h
til/fake_product_state.h
til/google_chrome_binaries_distribution.cc
til/google_chrome_binaries_distribution.h
til/google_chrome_distribution.cc
til/google_chrome_distribution.h
til/google_chrome_distribution_dummy.cc
til/google_chrome_distribution_unittest.cc
til/google_chrome_sxs_distribution.cc
til/google_chrome_sxs_distribution.h
til/google_update_constants.cc
til/google_update_constants.h
til/google_update_settings.cc
til/google_update_settings.h
til/google_update_settings_unittest.cc
til/google_update_util.cc
til/google_update_util.h
til/helper.cc
til/helper.h
til/html_dialog.h
til/html_dialog_impl.cc
til/install_util.cc
til/install_util.h
til/install_util_unittest.cc
til/installation_state.cc
til/installation_state.h
til/installation_validation_helper.cc
til/installation_validation_helper.h
til/installation_validator.cc
til/installation_validator.h
til/installation_validator_unittest.cc
til/installer_state.cc
til/installer_state.h
til/installer_state_unittest.cc
til/installer_util_test_common.cc
til/installer_util_test_common.h
til/installer_util_unittests.rc
til/installer_util_unittests_resource.h
til/l10n_string_util.cc
til/l10n_string_util.h
til/language_selector.cc
til/language_selector.h
til/language_selector_unittest.cc
til/logging_installer.cc
til/logging_installer.h
til/logging_installer_unittest.cc
til/lzma_util.cc
til/lzma_util.h
til/lzma_util_unittest.cc
til/master_preferences.cc
til/master_preferences.h
til/master_preferences_constants.cc
til/master_preferences_constants.h
til/master_preferences_dummy.cc
til/master_preferences_unittest.cc
til/move_tree_work_item.cc
til/move_tree_work_item.h
til/move_tree_work_item_unittest.cc
til/prebuild/create_string_rc.py
til/product.cc
til/product.h
til/product_operations.h
til/product_state_unittest.cc
til/product_unittest.cc
til/product_unittest.h
til/registry_key_backup.cc
til/registry_key_backup.h
til/registry_key_backup_unittest.cc
til/registry_test_data.cc
til/registry_test_data.h
til/run_all_unittests.cc
til/self_cleaning_temp_dir.cc
til/self_cleaning_temp_dir.h
til/self_cleaning_temp_dir_unittest.cc
til/self_reg_work_item.cc
til/self_reg_work_item.h
til/set_reg_value_work_item.cc
til/set_reg_value_work_item.h
til/set_reg_value_work_item_unittest.cc
til/shell_util.cc
til/shell_util.h
til/shell_util_unittest.cc
til/using_util.vsprops
til/util_constants.cc
til/util_constants.h
til/wmi.cc
til/wmi.h
til/wmi_unittest.cc
til/work_item.cc
til/work_item.h
til/work_item_list.cc
til/work_item_list.h
til/work_item_list_unittest.cc