Cleanup and style guideline conformance for policy implementation

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 127 matching lines @@
     ReloadFromTask() {
   // Make sure to not call Cancel() on the task, since it might hold the last
   // reference that keeps this object alive.
   reload_task_ = NULL;
   Reload();
 }
 
 void ConfigurationPolicyProviderWin::GroupPolicyChangeWatcher::
     OnObjectSignaled(HANDLE object) {
   DCHECK(object == user_policy_changed_event_.handle() ||
-         object == machine_policy_changed_event_.handle());
+         object == machine_policy_changed_event_.handle())
+      << "unexpected object signaled policy reload, obj = "
+      << std::showbase << std::hex << object;
   Reload();
 }
 
 void ConfigurationPolicyProviderWin::GroupPolicyChangeWatcher::
     WillDestroyCurrentMessageLoop() {
   reload_task_ = NULL;
   MessageLoop::current()->RemoveDestructionObserver(this);
 }
 
 ConfigurationPolicyProviderWin::ConfigurationPolicyProviderWin(
     const PolicyDefinitionList* policy_list)
     : ConfigurationPolicyProvider(policy_list) {
   watcher_ = new GroupPolicyChangeWatcher(this->AsWeakPtr(),
                                           kReloadIntervalMinutes);
   watcher_->Start();
 }
 
 ConfigurationPolicyProviderWin::~ConfigurationPolicyProviderWin() {
   watcher_->Stop();
 }
 
 bool ConfigurationPolicyProviderWin::GetRegistryPolicyString(
-    const string16& name, string16* result) {
+    const string16& name, string16* result) const {
   string16 path = string16(kRegistrySubKey);
   RegKey policy_key;
   // First try the global policy.
   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(), KEY_READ))
     return false;
   return ReadRegistryStringValue(&policy_key, name, result);
 }
 
 bool ConfigurationPolicyProviderWin::GetRegistryPolicyStringList(
-    const string16& key, ListValue* result) {
+    const string16& key, ListValue* result) const {
   string16 path = string16(kRegistrySubKey);
   path += ASCIIToUTF16("\\") + key;
   RegKey policy_key;
   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(), 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;
 }
 
 bool ConfigurationPolicyProviderWin::GetRegistryPolicyBoolean(
-    const string16& value_name, bool* result) {
+    const string16& value_name, bool* result) const {
   DWORD value;
   RegKey hkcu_policy_key(HKEY_LOCAL_MACHINE, kRegistrySubKey, KEY_READ);
   if (hkcu_policy_key.ReadValueDW(value_name.c_str(), &value)) {
     *result = value != 0;
     return true;
   }
 
   RegKey hklm_policy_key(HKEY_CURRENT_USER, kRegistrySubKey, KEY_READ);
   if (hklm_policy_key.ReadValueDW(value_name.c_str(), &value)) {
     *result = value != 0;
     return true;
   }
   return false;
 }
 
 bool ConfigurationPolicyProviderWin::GetRegistryPolicyInteger(
-    const string16& value_name, uint32* result) {
+    const string16& value_name, uint32* result) const {
   DWORD value;
   RegKey hkcu_policy_key(HKEY_LOCAL_MACHINE, kRegistrySubKey, KEY_READ);
   if (hkcu_policy_key.ReadValueDW(value_name.c_str(), &value)) {
     *result = value;
     return true;
   }
 
   RegKey hklm_policy_key(HKEY_CURRENT_USER, kRegistrySubKey, KEY_READ);
   if (hklm_policy_key.ReadValueDW(value_name.c_str(), &value)) {
     *result = value;
     return true;
   }
   return false;
 }
 
 bool ConfigurationPolicyProviderWin::Provide(
-    ConfigurationPolicyStore* store) {
+    ConfigurationPolicyStoreInterface* store) {
   const PolicyDefinitionList* policy_list(policy_definition_list());
   for (const PolicyDefinitionList::Entry* current = policy_list->begin;
        current != policy_list->end; ++current) {
     std::wstring name = UTF8ToWide(current->name);
     switch (current->value_type) {
       case Value::TYPE_STRING: {
         std::wstring string_value;
         if (GetRegistryPolicyString(name.c_str(), &string_value)) {
           store->Apply(current->policy_type,
                        Value::CreateStringValue(string_value));
@@ skipping 25 matching lines @@
       default:
         NOTREACHED();
         return false;
     }
   }
 
   return true;
 }
 
 }  // namespace policy