Cleanup the policy code after the recent moves into the component.

components/policy/core/common/policy_service_impl.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_COMMON_POLICY_SERVICE_IMPL_H_
 #define COMPONENTS_POLICY_CORE_COMMON_POLICY_SERVICE_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 10 matching lines @@
 
 namespace policy {
 
 class PolicyMap;
 
 class POLICY_EXPORT PolicyServiceImpl
     : public PolicyService,
       public ConfigurationPolicyProvider::Observer {
  public:
   typedef std::vector<ConfigurationPolicyProvider*> Providers;
-  typedef base::Callback<void(PolicyBundle*)> PreprocessCallback;
 
   // The PolicyServiceImpl will merge policies from |providers|. |providers|
   // must be sorted in decreasing order of priority; the first provider will
   // have the highest priority. The PolicyServiceImpl does not take ownership of
   // the providers, and they must outlive the PolicyServiceImpl.
-  // |preprocess_callback| will be applied every PolicyBundle before merginng.
-  PolicyServiceImpl(const Providers& providers,
-                    const PreprocessCallback& preprocess_callback);
+  explicit PolicyServiceImpl(const Providers& providers);
 
   virtual ~PolicyServiceImpl();
 
   // PolicyService overrides:
   virtual void AddObserver(PolicyDomain domain,
                            PolicyService::Observer* observer) OVERRIDE;
   virtual void RemoveObserver(PolicyDomain domain,
                               PolicyService::Observer* observer) OVERRIDE;
   virtual const PolicyMap& GetPolicies(
       const PolicyNamespace& ns) const OVERRIDE;
@@ skipping 33 matching lines @@
   // Maps each policy domain to its observer list.
   ObserverMap observers_;
 
   // True if all the providers are initialized for the indexed policy domain.
   bool initialization_complete_[POLICY_DOMAIN_SIZE];
 
   // Set of providers that have a pending update that was triggered by a
   // call to RefreshPolicies().
   std::set<ConfigurationPolicyProvider*> refresh_pending_;
 
-  // Callback invoked to manipulate a PolicyBundle before it is merged.
-  PreprocessCallback preprocess_callback_;
-
   // List of callbacks to invoke once all providers refresh after a
   // RefreshPolicies() call.
   std::vector<base::Closure> refresh_callbacks_;
 
   // Used to create tasks to delay new policy updates while we may be already
   // processing previous policy updates.
   base::WeakPtrFactory<PolicyServiceImpl> update_task_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyServiceImpl);
 };
 
 }  // namespace policy
 
 #endif  // COMPONENTS_POLICY_CORE_COMMON_POLICY_SERVICE_IMPL_H_