summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 02:42:58 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 02:42:58 +0000
commit196a0b024400dcebb59d6651f25df9cc813d7e6b (patch)
treed9cda75b50bad205f918b714346f40514ac4952f /chrome/browser
parent733531fd00483f6943d2032b19e546b38178c078 (diff)
downloadchromium_src-196a0b024400dcebb59d6651f25df9cc813d7e6b.zip
chromium_src-196a0b024400dcebb59d6651f25df9cc813d7e6b.tar.gz
chromium_src-196a0b024400dcebb59d6651f25df9cc813d7e6b.tar.bz2
Remove the default argument from RegKey::ReadValue.
BUG=44644 TEST=base_unittests --gtest_filter=RegistryTest.* Review URL: http://codereview.chromium.org/3259005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/importer/ie_importer.cc6
-rw-r--r--chrome/browser/platform_util_win.cc2
-rw-r--r--chrome/browser/policy/configuration_policy_provider_win.cc2
3 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index 469f1d6..59aad60 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -261,11 +261,13 @@ void IEImporter::ImportPasswordsIE7() {
while (reg_iterator.Valid() && !cancelled()) {
// Get the size of the encrypted data.
DWORD value_len = 0;
- if (key.ReadValue(reg_iterator.Name(), NULL, &value_len) && value_len) {
+ if (key.ReadValue(reg_iterator.Name(), NULL, &value_len, NULL) &&
+ value_len) {
// Query the encrypted data.
std::vector<unsigned char> value;
value.resize(value_len);
- if (key.ReadValue(reg_iterator.Name(), &value.front(), &value_len)) {
+ if (key.ReadValue(reg_iterator.Name(), &value.front(), &value_len,
+ NULL)) {
IE7PasswordInfo password_info;
password_info.url_hash = reg_iterator.Name();
password_info.encrypted_data = value;
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc
index d932b74..a807a42 100644
--- a/chrome/browser/platform_util_win.cc
+++ b/chrome/browser/platform_util_win.cc
@@ -116,7 +116,7 @@ void OpenExternal(const GURL& url) {
key.Open(HKEY_CLASSES_ROOT, registry_path.c_str(), KEY_READ);
if (key.Valid()) {
DWORD size = 0;
- key.ReadValue(NULL, NULL, &size);
+ key.ReadValue(NULL, NULL, &size, NULL);
if (size <= 2) {
// ShellExecute crashes the process when the command is empty.
// We check for "2" because it always returns the trailing NULL.
diff --git a/chrome/browser/policy/configuration_policy_provider_win.cc b/chrome/browser/policy/configuration_policy_provider_win.cc
index 7130083..284ca9d 100644
--- a/chrome/browser/policy/configuration_policy_provider_win.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win.cc
@@ -172,7 +172,7 @@ bool ConfigurationPolicyProviderWin::ReadRegistryStringValue(
// the 0-termination.
buffer.reset(new uint8[value_size + 2]);
memset(buffer.get(), 0, value_size + 2);
- key->ReadValue(name.c_str(), buffer.get(), &value_size);
+ key->ReadValue(name.c_str(), buffer.get(), &value_size, NULL);
result->assign(reinterpret_cast<const wchar_t*>(buffer.get()));
return true;
}