| Index: chrome/installer/setup/installer_crash_reporting.cc
|
| diff --git a/chrome/installer/setup/installer_crash_reporting.cc b/chrome/installer/setup/installer_crash_reporting.cc
|
| index 08063a0feb4f987ea87a01e1cb8580d5bb8d223f..f8de6654017bd93c77dafa2ee43424b2826d1e58 100644
|
| --- a/chrome/installer/setup/installer_crash_reporting.cc
|
| +++ b/chrome/installer/setup/installer_crash_reporting.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/installer/setup/installer_crash_reporting.h"
|
|
|
| #include <iterator>
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/command_line.h"
|
| @@ -57,10 +58,6 @@ const char *OperationToString(InstallerState::Operation operation) {
|
| switch (operation) {
|
| case InstallerState::SINGLE_INSTALL_OR_UPDATE:
|
| return "single-install-or-update";
|
| - case InstallerState::MULTI_INSTALL:
|
| - return "multi-install";
|
| - case InstallerState::MULTI_UPDATE:
|
| - return "multi-update";
|
| case InstallerState::UNINSTALL:
|
| return "uninstall";
|
| case InstallerState::UNINITIALIZED:
|
| @@ -94,7 +91,7 @@ void ConfigureCrashReporting(const InstallerState& installer_state) {
|
| // right here.
|
|
|
| // Create the crash client and install it (a la MainDllLoader::Launch).
|
| - InstallerCrashReporterClient *crash_client =
|
| + InstallerCrashReporterClient* crash_client =
|
| new InstallerCrashReporterClient(!installer_state.system_install());
|
| ANNOTATE_LEAKING_OBJECT_PTR(crash_client);
|
| crash_reporter::SetCrashReporterClient(crash_client);
|
| @@ -149,8 +146,7 @@ void SetInitialCrashKeys(const InstallerState& state) {
|
| SetCrashKeyValue(kDistributionType,
|
| DistributionTypeToString(state.state_type()));
|
| SetCrashKeyValue(kOperation, OperationToString(state.operation()));
|
| - SetCrashKeyValue(kIsMultiInstall,
|
| - state.is_multi_install() ? "true" : "false");
|
| + SetCrashKeyValue(kIsMultiInstall, "false");
|
| SetCrashKeyValue(kIsSystemLevel, state.system_install() ? "true" : "false");
|
|
|
| const base::string16 state_key = state.state_key();
|
|
|