Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_pref_store.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/policy/configuration_policy_pref_store.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 namespace policy {
 
 namespace {
 
 // Policies are loaded early on startup, before PolicyErrorMaps are ready to
 // be retrieved. This function is posted to UI to log any errors found on
 // Refresh below.
 void LogErrors(PolicyErrorMap* errors) {
   PolicyErrorMap::const_iterator iter;
   for (iter = errors->begin(); iter != errors->end(); ++iter) {
-    string16 policy = ASCIIToUTF16(GetPolicyName(iter->first));
+    string16 policy = ASCIIToUTF16(iter->first);
     DLOG(WARNING) << "Policy " << policy << ": " << iter->second;
   }
 }
 
 }  // namespace
 
 ConfigurationPolicyPrefStore::ConfigurationPolicyPrefStore(
     ConfigurationPolicyProvider* provider)
     : provider_(provider),
       initialization_complete_(false) {
@@ skipping 117 matching lines @@
   // issue during startup.
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
                           base::Bind(&LogErrors,
                                      base::Owned(errors.release())));
 
   return prefs.release();
 }
 
 }  // namespace policy