Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/automation/testing_automation_provider_chromeos.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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"
 #include "base/utf_string_conversions.h"
@@ skipping 176 matching lines @@
     policy::CloudPolicySubsystem* policy_subsystem,
     policy::CloudPolicyCacheBase::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);
     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());
+        dict->Set(i->first), i->second->value->DeepCopy());

[Mattias Nissler (ping if slow), 2012/01/16 18:23:33]

I think this won't compile.

[Joao da Silva, 2012/01/17 13:09:29]

Done.

     }
   }
   return dict;
 }
 
 // Last reported power status.
 chromeos::PowerSupplyStatus global_power_status;
 
 }  // namespace
 
@@ skipping 930 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;
 }