| Index: chrome/installer/setup/setup_main.cc
|
| diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
|
| index 66a01ec1d95c97f62bceb4feb47ca57f23a54c83..24caf8d8914569fdbdfaaee61a1c88e0c3129a7c 100644
|
| --- a/chrome/installer/setup/setup_main.cc
|
| +++ b/chrome/installer/setup/setup_main.cc
|
| @@ -44,7 +44,7 @@
|
| #include "chrome/installer/setup/archive_patch_helper.h"
|
| #include "chrome/installer/setup/install.h"
|
| #include "chrome/installer/setup/install_worker.h"
|
| -#include "chrome/installer/setup/installer_crash_reporting.h"
|
| +#include "chrome/installer/setup/installer_crash_reporter_client.h"
|
| #include "chrome/installer/setup/setup_constants.h"
|
| #include "chrome/installer/setup/setup_util.h"
|
| #include "chrome/installer/setup/uninstall.h"
|
| @@ -59,6 +59,7 @@
|
| #include "chrome/installer/util/install_util.h"
|
| #include "chrome/installer/util/installation_state.h"
|
| #include "chrome/installer/util/installation_validator.h"
|
| +#include "chrome/installer/util/installer_crash_reporting.h"
|
| #include "chrome/installer/util/installer_state.h"
|
| #include "chrome/installer/util/installer_util_strings.h"
|
| #include "chrome/installer/util/l10n_string_util.h"
|
| @@ -258,6 +259,7 @@ bool UncompressAndPatchChromeArchive(
|
| // than a patch file.
|
| if (base::PathExists(archive_helper->target())) {
|
| *archive_type = installer::FULL_ARCHIVE_TYPE;
|
| + installer::SetArchiveTypeCrashKey(*archive_type);
|
| return true;
|
| }
|
|
|
| @@ -288,6 +290,7 @@ bool UncompressAndPatchChromeArchive(
|
| }
|
|
|
| *archive_type = installer::INCREMENTAL_ARCHIVE_TYPE;
|
| + installer::SetArchiveTypeCrashKey(*archive_type);
|
| return true;
|
| }
|
|
|
| @@ -1420,6 +1423,7 @@ InstallStatus InstallProductsHelper(const InstallationState& original_state,
|
| return INVALID_ARCHIVE;
|
| }
|
| *archive_type = FULL_ARCHIVE_TYPE;
|
| + installer::SetArchiveTypeCrashKey(*archive_type);
|
| }
|
|
|
| // Unpack the uncompressed archive.
|
| @@ -1653,7 +1657,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
|
| InstallerState installer_state;
|
| installer_state.Initialize(cmd_line, prefs, original_state);
|
|
|
| - installer::ConfigureCrashReporting(installer_state);
|
| + InstallerCrashReporterClient::Configure(installer_state);
|
| installer::SetInitialCrashKeys(installer_state);
|
| installer::SetCrashKeysFromCommandLine(cmd_line);
|
|
|
| @@ -1700,6 +1704,10 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
|
| if (installer::ContainsUnsupportedSwitch(cmd_line))
|
| return installer::UNSUPPORTED_OPTION;
|
|
|
| + VLOG(1) << "crashing";
|
| + RaiseException(0x0000DEAD,0,0,0);
|
| + VLOG(1) << "done crashing";
|
| +
|
| // A variety of installer operations require the path to the current
|
| // executable. Get it once here for use throughout these operations. Note that
|
| // the path service is the authoritative source for this path. One might think
|
|
|