Removed the PolicyDefinitionList.

chrome/browser/policy/configuration_policy_handler_list.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_handler_list.h"
 
 #include <limits>
 
 #include "base/basictypes.h"
 #include "base/prefs/pref_value_map.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/url_blacklist_policy_handler.h"
 #include "chrome/browser/profiles/incognito_mode_policy_handler.h"
 #include "chrome/browser/search_engines/default_search_policy_handler.h"
 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
 #include "chrome/browser/sync/sync_policy_handler.h"
 #include "chrome/common/pref_names.h"
 #include "components/policy/core/common/policy_pref_names.h"
 #include "extensions/common/manifest.h"
 #include "grit/generated_resources.h"
 #include "policy/policy_constants.h"

[bartfab (slow), 2013/11/05 18:18:33]

Nit: policy/policy_constants.h now implicitly pulls in "callback_forward.h", so
all implementation files using it must #include "base/callback.h"

[Joao da Silva, 2013/11/07 20:27:27]

This file doesn't use the Callback interface

 
 #if defined(OS_CHROMEOS)
 #include "ash/magnifier/magnifier_constants.h"
 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h"
 #include "chromeos/dbus/power_policy_controller.h"
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/policy/configuration_policy_handler_android.h"
 #endif  // defined(OS_ANDROID)
@@ skipping 442 matching lines @@
 
   std::vector<ConfigurationPolicyHandler*>::const_iterator handler;
   for (handler = handlers_.begin(); handler != handlers_.end(); ++handler) {
     if ((*handler)->CheckPolicySettings(policies, errors) && prefs)
       (*handler)->ApplyPolicySettings(policies, prefs);
   }
 
   for (PolicyMap::const_iterator it = policies.begin();
        it != policies.end();
        ++it) {
-    if (IsDeprecatedPolicy(it->first))
+    const PolicyDetails* details = GetChromePolicyDetails(it->first);
+    if (details && details->is_deprecated)
       errors->AddError(it->first, IDS_POLICY_DEPRECATED);
   }
 }
 
 void ConfigurationPolicyHandlerList::PrepareForDisplaying(
     PolicyMap* policies) const {
   std::vector<ConfigurationPolicyHandler*>::const_iterator handler;
   for (handler = handlers_.begin(); handler != handlers_.end(); ++handler)
     (*handler)->PrepareForDisplaying(policies);
 }
@@ skipping 185 matching lines @@
 
 #if defined(OS_ANDROID)
   handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
       new ManagedBookmarksPolicyHandler()));
 #endif
   return handlers.Pass();
 }
 #endif  // !defined(OS_IOS)
 
 }  // namespace policy