Reland r57575 - Remove the default argument from RegKey::Open.

chrome/browser/policy/configuration_policy_provider_win.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/configuration_policy_provider_win.h"
 
 #include <userenv.h>
 
 #include <algorithm>
 
@@ skipping 44 matching lines @@
 
 ConfigurationPolicyProviderWin::ConfigurationPolicyProviderWin() {
   watcher_.reset(new GroupPolicyChangeWatcher(this));
 }
 
 bool ConfigurationPolicyProviderWin::GetRegistryPolicyString(
     const string16& name, string16* result) {
   string16 path = string16(policy::kRegistrySubKey);
   RegKey policy_key;
   // First try the global policy.
-  if (policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str())) {
+  if (policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str(), KEY_READ)) {
     if (ReadRegistryStringValue(&policy_key, name, result))
       return true;
     policy_key.Close();
   }
   // Fall back on user-specific policy.
-  if (!policy_key.Open(HKEY_CURRENT_USER, path.c_str()))
+  if (!policy_key.Open(HKEY_CURRENT_USER, path.c_str(), KEY_READ))
     return false;
   return ReadRegistryStringValue(&policy_key, name, result);
 }
 
 bool ConfigurationPolicyProviderWin::ReadRegistryStringValue(
     RegKey* key, const string16& name, string16* result) {
   DWORD value_size = 0;
   DWORD key_type = 0;
   scoped_array<uint8> buffer;
 
@@ skipping 11 matching lines @@
   key->ReadValue(name.c_str(), buffer.get(), &value_size);
   result->assign(reinterpret_cast<const wchar_t*>(buffer.get()));
   return true;
 }
 
 bool ConfigurationPolicyProviderWin::GetRegistryPolicyStringList(
     const string16& key, ListValue* result) {
   string16 path = string16(policy::kRegistrySubKey);
   path += ASCIIToUTF16("\\") + key;
   RegKey policy_key;
-  if (!policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str())) {
+  if (!policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str(), KEY_READ)) {
     policy_key.Close();
     // Fall back on user-specific policy.
-    if (!policy_key.Open(HKEY_CURRENT_USER, path.c_str()))
+    if (!policy_key.Open(HKEY_CURRENT_USER, path.c_str(), KEY_READ))
       return false;
   }
   string16 policy_string;
   int index = 0;
   while (ReadRegistryStringValue(&policy_key, base::IntToString16(++index),
                                  &policy_string)) {
     result->Append(Value::CreateStringValue(policy_string));
   }
   return true;
 }
@@ skipping 71 matching lines @@
         break;
       }
       default:
         NOTREACHED();
         return false;
     }
   }
 
   return true;
 }