Implement the ConfigDirPolicyProvider based on the AsyncPolicyLoader

chrome/browser/policy/browser_policy_connector.cc

Index: chrome/browser/policy/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 2b9aa22b4944beb8dbccee07abd32837058d941d..c2439bc6727812a4cbedc984c9dd6336821521e0 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -513,11 +513,9 @@ ConfigurationPolicyProvider*
 #elif defined(OS_POSIX)
   FilePath config_dir_path;
   if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
-    return new ConfigDirPolicyProvider(
-        policy_list,
-        POLICY_LEVEL_MANDATORY,
-        POLICY_SCOPE_MACHINE,
-        config_dir_path.Append(FILE_PATH_LITERAL("managed")));
+    return new ConfigDirPolicyProvider(policy_list,
+                                       POLICY_SCOPE_MACHINE,
+                                       config_dir_path);
   } else {
     return NULL;
   }
@@ -537,17 +535,6 @@ ConfigurationPolicyProvider*
 #elif defined(OS_MACOSX)
   return new ConfigurationPolicyProviderMac(policy_list,
                                             POLICY_LEVEL_RECOMMENDED);
-#elif defined(OS_POSIX)
-  FilePath config_dir_path;
-  if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
-    return new ConfigDirPolicyProvider(
-        policy_list,
-        POLICY_LEVEL_RECOMMENDED,
-        POLICY_SCOPE_MACHINE,
-        config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
-  } else {
-    return NULL;
-  }
 #else
   return NULL;
 #endif