| Index: chrome/installer/util/google_update_settings.cc
|
| diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
|
| index babd396e6909a6a32ddc62505da6e1a723644525..8f8e296f6cb8a77b1674cd5777063ee48d05520b 100644
|
| --- a/chrome/installer/util/google_update_settings.cc
|
| +++ b/chrome/installer/util/google_update_settings.cc
|
| @@ -113,8 +113,8 @@ EulaSearchResult HasEULASetting(HKEY root, const std::wstring& state_key,
|
| DWORD previous_value = setting ? 1 : 0;
|
| if (key.Open(root, state_key.c_str(), KEY_QUERY_VALUE) != ERROR_SUCCESS)
|
| return NO_SETTING;
|
| - if (key.ReadValueDW(google_update::kRegEULAAceptedField,
|
| - &previous_value) != ERROR_SUCCESS)
|
| + if (key.ReadValue(google_update::kRegEULAAceptedField,
|
| + &previous_value) != ERROR_SUCCESS)
|
| return FOUND_CLIENT_STATE;
|
|
|
| return ((previous_value != 0) == setting) ?
|
| @@ -206,16 +206,16 @@ bool GoogleUpdateSettings::GetCollectStatsConsent() {
|
| system_install &&
|
| key.Open(HKEY_LOCAL_MACHINE, dist->GetStateMediumKey().c_str(),
|
| KEY_QUERY_VALUE) == ERROR_SUCCESS &&
|
| - key.ReadValueDW(google_update::kRegUsageStatsField,
|
| - &value) == ERROR_SUCCESS;
|
| + key.ReadValue(google_update::kRegUsageStatsField,
|
| + &value) == ERROR_SUCCESS;
|
|
|
| // Otherwise, try ClientState.
|
| have_value =
|
| !have_value &&
|
| key.Open(system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER,
|
| dist->GetStateKey().c_str(), KEY_QUERY_VALUE) == ERROR_SUCCESS &&
|
| - key.ReadValueDW(google_update::kRegUsageStatsField,
|
| - &value) == ERROR_SUCCESS;
|
| + key.ReadValue(google_update::kRegUsageStatsField,
|
| + &value) == ERROR_SUCCESS;
|
|
|
| // Google Update specifically checks that the value is 1, so we do the same.
|
| return have_value && value == 1;
|
| @@ -508,14 +508,14 @@ GoogleUpdateSettings::UpdatePolicy GoogleUpdateSettings::GetAppUpdatePolicy(
|
| kPrefixLen);
|
| app_update_override.append(app_guid);
|
| // First try to read and comprehend the app-specific override.
|
| - found_override = (policy_key.ReadValueDW(app_update_override.c_str(),
|
| - &value) == ERROR_SUCCESS &&
|
| + found_override = (policy_key.ReadValue(app_update_override.c_str(),
|
| + &value) == ERROR_SUCCESS &&
|
| GetUpdatePolicyFromDword(value, &update_policy));
|
|
|
| // Failing that, try to read and comprehend the default override.
|
| if (!found_override &&
|
| - policy_key.ReadValueDW(kGoogleUpdateUpdatePolicyValue,
|
| - &value) == ERROR_SUCCESS) {
|
| + policy_key.ReadValue(kGoogleUpdateUpdatePolicyValue,
|
| + &value) == ERROR_SUCCESS) {
|
| GetUpdatePolicyFromDword(value, &update_policy);
|
| }
|
| }
|
|
|