Implement the ConfigDirPolicyProvider based on the AsyncPolicyLoader

chrome/browser/policy/config_dir_policy_provider.h

Index: chrome/browser/policy/config_dir_policy_provider.h
diff --git a/chrome/browser/policy/config_dir_policy_provider.h b/chrome/browser/policy/config_dir_policy_provider.h
index e938c1df07b40b8ab07aa739a798bdb1a4337f74..33cfb826d6b24d6539fd707a76300dd18690a344 100644
--- a/chrome/browser/policy/config_dir_policy_provider.h
+++ b/chrome/browser/policy/config_dir_policy_provider.h
@@ -23,7 +23,6 @@ class PolicyBundle;
 class ConfigDirPolicyProvider : public FileBasedPolicyProvider {
  public:
   ConfigDirPolicyProvider(const PolicyDefinitionList* policy_list,
-                          PolicyLevel level,
                           PolicyScope scope,
                           const FilePath& config_dir);
 
@@ -40,7 +39,6 @@ class ConfigDirPolicyProviderDelegate
     : public FileBasedPolicyProvider::ProviderDelegate {
  public:
   ConfigDirPolicyProviderDelegate(const FilePath& config_dir,
-                                  PolicyLevel level,
                                   PolicyScope scope);
 
   // FileBasedPolicyProvider::ProviderDelegate implementation.
@@ -48,12 +46,17 @@ class ConfigDirPolicyProviderDelegate
   virtual base::Time GetLastModification() OVERRIDE;
 
  private:
-  // Merges the 3rd party |policies| into the |bundle|.
-  void Merge3rdPartyPolicy(PolicyBundle* bundle,
-                           const base::Value* policies);
+  // Loads the policy files at |path| into the |bundle|, with the given |level|.
+  void LoadFromPath(const FilePath& path,
+                    PolicyLevel level,
+                    PolicyBundle* bundle);
 
-  // Policies loaded by this provider will have these attributes.
-  PolicyLevel level_;
+  // Merges the 3rd party |policies| into the |bundle|, with the given |level|.
+  void Merge3rdPartyPolicy(const base::Value* policies,
+                           PolicyLevel level,
+                           PolicyBundle* bundle);
+
+  // Policies loaded by this provider will have this scope.
   PolicyScope scope_;
 
   DISALLOW_COPY_AND_ASSIGN(ConfigDirPolicyProviderDelegate);