Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/automation/testing_automation_provider_chromeos.cc

 // Copyright (c) 2012 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/automation/testing_automation_provider.h"
 
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
@@ skipping 168 matching lines @@
     default:
       return "UNKNOWN_STATE";
   }
 }
 
 // Fills the supplied DictionaryValue with all policy settings held by the
 // given CloudPolicySubsystem (Device or User subsystems) at the given
 // PolicyLevel (Mandatory or Recommended policies).
 DictionaryValue* CreateDictionaryWithPolicies(
     policy::CloudPolicySubsystem* policy_subsystem,
-    policy::CloudPolicyCacheBase::PolicyLevel policy_level) {
+    policy::PolicyLevel policy_level) {
   DictionaryValue* dict = new DictionaryValue;
   policy::CloudPolicyCacheBase* policy_cache =
       policy_subsystem->GetCloudPolicyCacheBase();
   if (policy_cache) {
-    const policy::PolicyMap* policy_map = policy_cache->policy(policy_level);
+    const policy::PolicyMap* policy_map = policy_cache->policy();
     if (policy_map) {
       policy::PolicyMap::const_iterator i;
-      for (i = policy_map->begin(); i != policy_map->end(); i++)
-        dict->Set(policy::GetPolicyName(i->first),
-                  i->second->DeepCopy());
+      for (i = policy_map->begin(); i != policy_map->end(); i++) {
+        if (i->second.level == policy_level)
+          dict->Set(i->first, i->second.value->DeepCopy());
+      }
     }
   }
   return dict;
 }
 
 // Last reported power status.
 chromeos::PowerSupplyStatus global_power_status;
 
 }  // namespace
 
@@ skipping 769 matching lines @@
   return_value->SetString("machine_id", device_data_store->machine_id());
   return_value->SetString("machine_model", device_data_store->machine_model());
   return_value->SetString("user_name", device_data_store->user_name());
   return_value->SetBoolean("device_token_cache_loaded",
                            device_data_store->token_cache_loaded());
   return_value->SetBoolean("user_token_cache_loaded",
                            user_data_store->token_cache_loaded());
   // Get PolicyMaps.
   return_value->Set("device_mandatory_policies",
                     CreateDictionaryWithPolicies(device_cloud_policy,
-                        policy::CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY));
+                        policy::POLICY_LEVEL_MANDATORY));
   return_value->Set("user_mandatory_policies",
                     CreateDictionaryWithPolicies(user_cloud_policy,
-                        policy::CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY));
+                        policy::POLICY_LEVEL_MANDATORY));
   return_value->Set("device_recommended_policies",
       CreateDictionaryWithPolicies(device_cloud_policy,
-          policy::CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED));
+          policy::POLICY_LEVEL_RECOMMENDED));
   return_value->Set("user_recommended_policies",
       CreateDictionaryWithPolicies(user_cloud_policy,
-          policy::CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED));
+          policy::POLICY_LEVEL_RECOMMENDED));
   reply.SendSuccess(return_value.get());
 }
 
 void TestingAutomationProvider::GetTimeInfo(Browser* browser,
                                             DictionaryValue* args,
                                             IPC::Message* reply_message) {
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   base::Time time(base::Time::Now());
   bool use_24hour_clock = browser && browser->profile()->GetPrefs()->GetBoolean(
       prefs::kUse24HourClock);
@@ skipping 131 matching lines @@
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       AddObserver(power_manager_observer_);
 }
 
 void TestingAutomationProvider::RemoveChromeosObservers() {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RemoveObserver(power_manager_observer_);
   delete power_manager_observer_;
   power_manager_observer_ = NULL;
 }