Implement the ConfigDirPolicyProvider based on the AsyncPolicyLoader

chrome/browser/policy/browser_policy_connector.cc

 // 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.
 
 #include "chrome/browser/policy/browser_policy_connector.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 20 matching lines @@
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "policy/policy_constants.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/policy/configuration_policy_provider_win.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/policy/policy_loader_mac.h"
 #include "chrome/browser/preferences_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)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/policy/app_pack_updater.h"
 #include "chrome/browser/policy/cros_user_policy_cache.h"
 #include "chrome/browser/policy/device_policy_cache.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
@@ skipping 61 matching lines @@
   user_data_store_.reset();
 
   if (user_cloud_policy_manager_.get())
     user_cloud_policy_manager_->Shutdown();
   user_cloud_policy_manager_.reset();
 
   device_management_service_.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
   // is performed. This is used to ensure that the Profile's PrefService sees
   // managed preferences on managed Chrome OS devices. However, this also
   // prevents creation of new Profiles in Desktop Chrome. The implementation of
   // cloud policy on the Desktop requires a refactoring of the cloud provider,
   // but for now it just isn't created.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDeviceManagementUrl)) {
@@ skipping 21 matching lines @@
       FROM_HERE,
       base::Bind(base::IgnoreResult(&BrowserPolicyConnector::GetAppPackUpdater),
                  weak_ptr_factory_.GetWeakPtr()));
 #endif
 }
 
 PolicyService* BrowserPolicyConnector::CreatePolicyService(
     Profile* profile) {
   // |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());
 
   // The global policy service uses the proxy provider to allow for swapping in
   // user policy after startup, while profiles use |user_cloud_policy_manager_|
   // directly as their provider, which may also block initialization on a policy
   // fetch at login time.
   if (profile) {
     if (user_cloud_policy_manager_.get())
       providers.push_back(user_cloud_policy_manager_.get());
@@ skipping 368 matching lines @@
   device_data_store_->set_device_status_collector(
       new DeviceStatusCollector(
           g_browser_process->local_state(),
           chromeos::system::StatisticsProvider::GetInstance(),
           NULL));
 #endif
 }
 
 // static
 ConfigurationPolicyProvider*
-    BrowserPolicyConnector::CreateManagedPlatformProvider() {
+    BrowserPolicyConnector::CreatePlatformProvider() {
   const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
 #if defined(OS_WIN)
   return new ConfigurationPolicyProviderWin(policy_list);
 #elif defined(OS_MACOSX)
   scoped_ptr<AsyncPolicyLoader> loader(
       new PolicyLoaderMac(policy_list, new MacPreferences()));
   return new AsyncPolicyProvider(policy_list, loader.Pass());
 #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")));
+    scoped_ptr<AsyncPolicyLoader> loader(
+        new ConfigDirPolicyLoader(config_dir_path, POLICY_SCOPE_MACHINE));
+    return new AsyncPolicyProvider(policy_list, loader.Pass());
   } 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")));
-  } else {
-    return NULL;
-  }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy