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 ac4c006a0263be9c1813e5efaf5bd6e26344a234..d0fed20d86c57488f2560963160c699051adb697 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -32,7 +32,7 @@
 #elif defined(OS_MACOSX)
 #include "chrome/browser/policy/policy_loader_mac.h"
 #elif defined(OS_POSIX)
-#include "chrome/browser/policy/config_dir_policy_provider.h"
+#include "chrome/browser/policy/config_dir_policy_loader.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -111,13 +111,11 @@ BrowserPolicyConnector::~BrowserPolicyConnector() {
   // ConfigurationPolicyPrefStore.
   recommended_cloud_provider_.reset();
   managed_cloud_provider_.reset();
-  recommended_platform_provider_.reset();
-  managed_platform_provider_.reset();
+  platform_provider_.reset();
 }
 
 void BrowserPolicyConnector::Init() {
-  managed_platform_provider_.reset(CreateManagedPlatformProvider());
-  recommended_platform_provider_.reset(CreateRecommendedPlatformProvider());
+  platform_provider_.reset(CreatePlatformProvider());
 
 #if defined(OS_CHROMEOS)
   // The CloudPolicyProvider blocks asynchronous Profile creation until a login
@@ -154,12 +152,10 @@ PolicyService* BrowserPolicyConnector::CreatePolicyService(
     Profile* profile) const {
   // |providers| in decreasing order of priority.
   PolicyServiceImpl::Providers providers;
-  if (managed_platform_provider_.get())
-    providers.push_back(managed_platform_provider_.get());
+  if (platform_provider_.get())
+    providers.push_back(platform_provider_.get());
   if (managed_cloud_provider_.get())
     providers.push_back(managed_cloud_provider_.get());
-  if (recommended_platform_provider_.get())
-    providers.push_back(recommended_platform_provider_.get());
   if (recommended_cloud_provider_.get())
     providers.push_back(recommended_cloud_provider_.get());
   return new PolicyServiceImpl(providers);
@@ -502,7 +498,7 @@ void BrowserPolicyConnector::CompleteInitialization() {
 
 // static
 ConfigurationPolicyProvider*
-    BrowserPolicyConnector::CreateManagedPlatformProvider() {
+    BrowserPolicyConnector::CreatePlatformProvider() {
   const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
 #if defined(OS_WIN)
   return new ConfigurationPolicyProviderWin(policy_list);
@@ -511,31 +507,10 @@ ConfigurationPolicyProvider*
 #elif defined(OS_POSIX)
   FilePath config_dir_path;
   if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
-    return new ConfigDirPolicyProvider(
+    return ConfigDirPolicyLoader::CreateProvider(
         policy_list,
-        POLICY_LEVEL_MANDATORY,
         POLICY_SCOPE_MACHINE,
-        config_dir_path.Append(FILE_PATH_LITERAL("managed")));
-  } else {
-    return NULL;
-  }
-#else
-  return NULL;
-#endif
-}
-
-// static
-ConfigurationPolicyProvider*
-    BrowserPolicyConnector::CreateRecommendedPlatformProvider() {
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-  const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
-  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")));
+        config_dir_path);
   } else {
     return NULL;
   }