Cleanup the ConfigurationPolicyHandler interface.

components/policy/core/browser/configuration_policy_handler.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 "components/policy/core/browser/configuration_policy_handler.h"
 
 #include <algorithm>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ skipping 30 matching lines @@
 
 ConfigurationPolicyHandler::ConfigurationPolicyHandler() {
 }
 
 ConfigurationPolicyHandler::~ConfigurationPolicyHandler() {
 }
 
 void ConfigurationPolicyHandler::PrepareForDisplaying(
     PolicyMap* policies) const {}
 
-void ConfigurationPolicyHandler::ApplyPolicySettings(
-    const policy::PolicyMap& policies,
-    PrefValueMap* prefs) {
-  NOTREACHED();
-}
-
 void ConfigurationPolicyHandler::ApplyPolicySettingsWithParameters(
     const PolicyMap& policies,
     const PolicyHandlerParameters& parameters,
     PrefValueMap* prefs) {
   ApplyPolicySettings(policies, prefs);
 }
 
 // TypeCheckingPolicyHandler implementation ------------------------------------
 
 TypeCheckingPolicyHandler::TypeCheckingPolicyHandler(
@@ skipping 392 matching lines @@
     for (handler = legacy_policy_handlers_.begin();
          handler != legacy_policy_handlers_.end();
          ++handler) {
       if ((*handler)->CheckPolicySettings(policies, errors))
         valid_policy_found = true;
     }
     return valid_policy_found;
   }
 }
 
-void LegacyPoliciesDeprecatingPolicyHandler::ApplyPolicySettings(
-    const PolicyMap& policies,
+void LegacyPoliciesDeprecatingPolicyHandler::ApplyPolicySettingsWithParameters(
+    const policy::PolicyMap& policies,
+    const policy::PolicyHandlerParameters& parameters,
     PrefValueMap* prefs) {
   if (policies.Get(new_policy_handler_->policy_name())) {
-    new_policy_handler_->ApplyPolicySettings(policies, prefs);
+    new_policy_handler_->ApplyPolicySettingsWithParameters(policies, parameters,
+                                                           prefs);
   } else {
     // The new policy is not set, fall back to legacy ones.
     PolicyErrorMap scoped_errors;
     ScopedVector<ConfigurationPolicyHandler>::iterator handler;
     for (handler = legacy_policy_handlers_.begin();
          handler != legacy_policy_handlers_.end();
          ++handler) {
-      if ((*handler)->CheckPolicySettings(policies, &scoped_errors))
-        (*handler)->ApplyPolicySettings(policies, prefs);
+      if (!(*handler)->CheckPolicySettings(policies, &scoped_errors)) {

[Mattias Nissler (ping if slow), 2015/03/26 11:13:59]

Wait, is the change of polarity in this conditional intentional?

[pneubeck (no reviews), 2015/03/26 14:53:34]

Thanks for catching!
that's also why the tests failed.

+        (*handler)
+            ->ApplyPolicySettingsWithParameters(policies, parameters, prefs);
+      }
     }
   }
 }
+void LegacyPoliciesDeprecatingPolicyHandler::ApplyPolicySettings(
+    const policy::PolicyMap& /* policies */,
+    PrefValueMap* /* prefs */) {
+  NOTREACHED();
+}
 
 }  // namespace policy