| Index: chrome/installer/util/installation_state.cc
|
| diff --git a/chrome/installer/util/installation_state.cc b/chrome/installer/util/installation_state.cc
|
| index ab099246c8276e68a75333c3fca6a3ecb7861a29..c9e246991623f6de48f9c2fdd0c23da3da1c1a17 100644
|
| --- a/chrome/installer/util/installation_state.cc
|
| +++ b/chrome/installer/util/installation_state.cc
|
| @@ -98,18 +98,18 @@ bool ProductState::Initialize(bool system_install,
|
| // "usagestats" may be absent, 0 (false), or 1 (true). On the chance that
|
| // different values are permitted in the future, we'll simply hold whatever
|
| // we find.
|
| - has_usagestats_ = (key.ReadValueDW(google_update::kRegUsageStatsField,
|
| - &usagestats_) == ERROR_SUCCESS);
|
| + has_usagestats_ = (key.ReadValue(google_update::kRegUsageStatsField,
|
| + &usagestats_) == ERROR_SUCCESS);
|
| // "oeminstall" may be present with any value or absent.
|
| has_oem_install_ = (key.ReadValue(google_update::kRegOemInstallField,
|
| &oem_install_) == ERROR_SUCCESS);
|
| // "eulaaccepted" may be absent, 0 or 1.
|
| - has_eula_accepted_ = (key.ReadValueDW(google_update::kRegEULAAceptedField,
|
| - &eula_accepted_) == ERROR_SUCCESS);
|
| + has_eula_accepted_ = (key.ReadValue(google_update::kRegEULAAceptedField,
|
| + &eula_accepted_) == ERROR_SUCCESS);
|
| // "msi" may be absent, 0 or 1
|
| DWORD dw_value = 0;
|
| - msi_ = (key.ReadValueDW(google_update::kRegMSIField,
|
| - &dw_value) == ERROR_SUCCESS) && (dw_value != 0);
|
| + msi_ = (key.ReadValue(google_update::kRegMSIField,
|
| + &dw_value) == ERROR_SUCCESS) && (dw_value != 0);
|
| // Multi-install is implied or is derived from the command-line.
|
| if (distribution->GetType() == BrowserDistribution::CHROME_BINARIES)
|
| multi_install_ = true;
|
| @@ -124,14 +124,14 @@ bool ProductState::Initialize(bool system_install,
|
| KEY_QUERY_VALUE) == ERROR_SUCCESS) {
|
| DWORD dword_value = 0;
|
|
|
| - if (key.ReadValueDW(google_update::kRegUsageStatsField,
|
| - &dword_value) == ERROR_SUCCESS) {
|
| + if (key.ReadValue(google_update::kRegUsageStatsField,
|
| + &dword_value) == ERROR_SUCCESS) {
|
| has_usagestats_ = true;
|
| usagestats_ = dword_value;
|
| }
|
|
|
| - if (key.ReadValueDW(google_update::kRegEULAAceptedField,
|
| - &dword_value) == ERROR_SUCCESS) {
|
| + if (key.ReadValue(google_update::kRegEULAAceptedField,
|
| + &dword_value) == ERROR_SUCCESS) {
|
| has_eula_accepted_ = true;
|
| eula_accepted_ = dword_value;
|
| }
|
|
|