Cleanup the ConfigurationPolicyHandler interface.

components/policy/core/browser/configuration_policy_handler.h

 // 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.
 
 #ifndef COMPONENTS_POLICY_CORE_BROWSER_CONFIGURATION_POLICY_HANDLER_H_
 #define COMPONENTS_POLICY_CORE_BROWSER_CONFIGURATION_POLICY_HANDLER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 37 matching lines @@
   virtual bool CheckPolicySettings(const PolicyMap& policies,
                                    PolicyErrorMap* errors) = 0;
 
   // Processes the policies handled by this ConfigurationPolicyHandler and sets
   // the appropriate preferences in |prefs|.
   virtual void ApplyPolicySettingsWithParameters(
       const PolicyMap& policies,
       const PolicyHandlerParameters& parameters,
       PrefValueMap* prefs);
 
-  // This is a convenience version of ApplyPolicySettingsWithParameters()
-  // that leaves out the |parameters|. Anyone extending
-  // ConfigurationPolicyHandler should implement either ApplyPolicySettings or
-  // ApplyPolicySettingsWithParameters.
-  virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs);
-
   // Modifies the values of some of the policies in |policies| so that they
   // are more suitable to display to the user. This can be used to remove
   // sensitive values such as passwords, or to pretty-print values.
   virtual void PrepareForDisplaying(PolicyMap* policies) const;
 
+ protected:
+  // This is a convenience version of ApplyPolicySettingsWithParameters()
+  // for derived classes that leaves out the |parameters|. Anyone extending
+  // ConfigurationPolicyHandler should implement either
+  // ApplyPolicySettingsWithParameters directly and implement
+  // ApplyPolicySettings with a NOTREACHED or implement only
+  // ApplyPolicySettings.
+  virtual void ApplyPolicySettings(const PolicyMap& policies,
+                                   PrefValueMap* prefs) = 0;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyHandler);
 };
 
 // Abstract class derived from ConfigurationPolicyHandler that should be
 // subclassed to handle a single policy (not a combination of policies).
 class POLICY_EXPORT TypeCheckingPolicyHandler
     : public ConfigurationPolicyHandler {
  public:
   TypeCheckingPolicyHandler(const char* policy_name,
@@ skipping 252 matching lines @@
     : public ConfigurationPolicyHandler {
  public:
   LegacyPoliciesDeprecatingPolicyHandler(
       ScopedVector<ConfigurationPolicyHandler> legacy_policy_handlers,
       scoped_ptr<SchemaValidatingPolicyHandler> new_policy_handler);
   ~LegacyPoliciesDeprecatingPolicyHandler() override;
 
   // ConfigurationPolicyHandler:
   bool CheckPolicySettings(const PolicyMap& policies,
                            PolicyErrorMap* errors) override;
+  void ApplyPolicySettingsWithParameters(
+      const policy::PolicyMap& policies,
+      const policy::PolicyHandlerParameters& parameters,
+      PrefValueMap* prefs) override;
+
+ protected:
   void ApplyPolicySettings(const PolicyMap& policies,
                            PrefValueMap* prefs) override;
 
  private:
   ScopedVector<ConfigurationPolicyHandler> legacy_policy_handlers_;
   scoped_ptr<SchemaValidatingPolicyHandler> new_policy_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(LegacyPoliciesDeprecatingPolicyHandler);
 };
 
 }  // namespace policy
 
 #endif  // COMPONENTS_POLICY_CORE_BROWSER_CONFIGURATION_POLICY_HANDLER_H_