Implement the ConfigDirPolicyProvider based on the AsyncPolicyLoader

chrome/browser/policy/config_dir_policy_loader.cc

Index: chrome/browser/policy/config_dir_policy_loader.cc
diff --git a/chrome/browser/policy/config_dir_policy_provider.cc b/chrome/browser/policy/config_dir_policy_loader.cc
similarity index 58%
rename from chrome/browser/policy/config_dir_policy_provider.cc
rename to chrome/browser/policy/config_dir_policy_loader.cc
index c86fa5093645c1bf06a131b1ad9fe1b2319b0de2..abf0633d90694a36385a7dafc5d712afb1492be2 100644
--- a/chrome/browser/policy/config_dir_policy_provider.cc
+++ b/chrome/browser/policy/config_dir_policy_loader.cc
@@ -2,34 +2,96 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/policy/config_dir_policy_provider.h"
+#include "chrome/browser/policy/config_dir_policy_loader.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
-#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/platform_file.h"
 #include "base/stl_util.h"
-#include "chrome/browser/policy/policy_bundle.h"
 
 namespace policy {
 
-ConfigDirPolicyProviderDelegate::ConfigDirPolicyProviderDelegate(
-    const FilePath& config_dir,
-    PolicyLevel level,
-    PolicyScope scope)
-    : FileBasedPolicyProvider::ProviderDelegate(config_dir),
-      level_(level),
+namespace {
+
+// Subdirectories that contain the mandatory and recommended policies.
+const char kMandatoryConfigDir[] = "managed";

[Mattias Nissler (ping if slow), 2012/06/04 09:36:36]

why not make these FILE_PATH_LITERAL?

[Joao da Silva, 2012/06/05 09:16:28]

Done.

+const char kRecommendedConfigDir[] = "recommended";
+
+}  // namespace
+
+ConfigDirPolicyLoader::ConfigDirPolicyLoader(const FilePath& config_dir,
+                                             PolicyScope scope)
+    : config_dir_(config_dir),
       scope_(scope) {}
 
-scoped_ptr<PolicyBundle> ConfigDirPolicyProviderDelegate::Load() {
+ConfigDirPolicyLoader::~ConfigDirPolicyLoader() {}
+
+// static
+AsyncPolicyProvider* ConfigDirPolicyLoader::CreateProvider(
+    const PolicyDefinitionList* policy_list,
+    PolicyScope scope,
+    const FilePath& config_dir) {
+  ConfigDirPolicyLoader* loader = new ConfigDirPolicyLoader(config_dir, scope);
+  return new AsyncPolicyProvider(policy_list, loader);
+}
+
+void ConfigDirPolicyLoader::InitOnFile() {
+  WatchPath(config_dir_.AppendASCII(kMandatoryConfigDir));
+  WatchPath(config_dir_.AppendASCII(kRecommendedConfigDir));
+}
+
+scoped_ptr<PolicyBundle> ConfigDirPolicyLoader::Load() {
+  scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
+  LoadFromPath(config_dir_.AppendASCII(kMandatoryConfigDir),
+               POLICY_LEVEL_MANDATORY,
+               bundle.get());
+  LoadFromPath(config_dir_.AppendASCII(kRecommendedConfigDir),
+               POLICY_LEVEL_RECOMMENDED,
+               bundle.get());
+  return bundle.Pass();
+}
+
+base::Time ConfigDirPolicyLoader::LastModificationTime() {
+  static const char* paths[] = {

[Mattias Nissler (ping if slow), 2012/06/04 09:36:36]

should be kPaths, or even better: kConfigDirSuffixes

[Joao da Silva, 2012/06/05 09:16:28]

Done.

+    kMandatoryConfigDir,
+    kRecommendedConfigDir,
+  };
+
+  base::Time last_modification = base::Time();
+  base::PlatformFileInfo info;
+
+  for (size_t i = 0; i < arraysize(paths); ++i) {
+    FilePath path(config_dir_.AppendASCII(paths[i]));
+
+    // Skip if the file doesn't exist, or it isn't a directory.
+    if (!file_util::GetFileInfo(path, &info) || !info.is_directory)
+      continue;
+
+    // Enumerate the files and find the most recent modification timestamp.
+    file_util::FileEnumerator file_enumerator(path, false,
+                                              file_util::FileEnumerator::FILES);
+    for (FilePath config_file = file_enumerator.Next();
+         !config_file.empty();
+         config_file = file_enumerator.Next()) {
+      if (file_util::GetFileInfo(config_file, &info) && !info.is_directory)
+        last_modification = std::max(last_modification, info.last_modified);
+    }
+  }
+
+  return last_modification;
+}
+
+void ConfigDirPolicyLoader::LoadFromPath(const FilePath& path,
+                                         PolicyLevel level,
+                                         PolicyBundle* bundle) {
   // Enumerate the files and sort them lexicographically.
   std::set<FilePath> files;
-  file_util::FileEnumerator file_enumerator(config_file_path(), false,
+  file_util::FileEnumerator file_enumerator(path, false,
                                             file_util::FileEnumerator::FILES);
   for (FilePath config_file_path = file_enumerator.Next();
        !config_file_path.empty(); config_file_path = file_enumerator.Next())
@@ -39,7 +101,6 @@ scoped_ptr<PolicyBundle> ConfigDirPolicyProviderDelegate::Load() {
   // The files are processed in reverse order because |MergeFrom| gives priority
   // to existing keys, but the ConfigDirPolicyProvider gives priority to the
   // last file in lexicographic order.
-  scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
   for (std::set<FilePath>::reverse_iterator config_file_iter = files.rbegin();
        config_file_iter != files.rend(); ++config_file_iter) {
     JSONFileValueSerializer deserializer(*config_file_iter);
@@ -63,54 +124,27 @@ scoped_ptr<PolicyBundle> ConfigDirPolicyProviderDelegate::Load() {
     // Detach the "3rdparty" node.
     base::Value* third_party = NULL;
     if (dictionary_value->Remove("3rdparty", &third_party)) {
-      Merge3rdPartyPolicy(bundle.get(), third_party);
+      Merge3rdPartyPolicy(third_party, level, bundle);
       delete third_party;
     }
 
     // Add chrome policy.
     PolicyMap policy_map;
-    policy_map.LoadFrom(dictionary_value, level_, scope_);
+    policy_map.LoadFrom(dictionary_value, level, scope_);
     bundle->Get(POLICY_DOMAIN_CHROME, "").MergeFrom(policy_map);
   }
-
-  return bundle.Pass();
 }
 
-base::Time ConfigDirPolicyProviderDelegate::GetLastModification() {
-  base::Time last_modification = base::Time();
-  base::PlatformFileInfo file_info;
-
-  // If the path does not exist or points to a directory, it's safe to load.
-  if (!file_util::GetFileInfo(config_file_path(), &file_info) ||
-      !file_info.is_directory) {
-    return last_modification;
-  }
-
-  // Enumerate the files and find the most recent modification timestamp.
-  file_util::FileEnumerator file_enumerator(config_file_path(),
-                                            false,
-                                            file_util::FileEnumerator::FILES);
-  for (FilePath config_file = file_enumerator.Next();
-       !config_file.empty();
-       config_file = file_enumerator.Next()) {
-    if (file_util::GetFileInfo(config_file, &file_info) &&
-        !file_info.is_directory) {
-      last_modification = std::max(last_modification, file_info.last_modified);
-    }
-  }
-
-  return last_modification;
-}
-
-void ConfigDirPolicyProviderDelegate::Merge3rdPartyPolicy(
-    PolicyBundle* bundle,
-    const base::Value* value) {
-  // The first-level entries in |value| are PolicyDomains. The second-level
+void ConfigDirPolicyLoader::Merge3rdPartyPolicy(
+    const base::Value* policies,
+    PolicyLevel level,
+    PolicyBundle* bundle) {
+  // The first-level entries in |policies| are PolicyDomains. The second-level
   // entries are component IDs, and the third-level entries are the policies
   // for that domain/component namespace.
 
   const base::DictionaryValue* domains_dictionary;
-  if (!value->GetAsDictionary(&domains_dictionary)) {
+  if (!policies->GetAsDictionary(&domains_dictionary)) {
     LOG(WARNING) << "3rdparty value is not a dictionary!";
     return;
   }
@@ -145,19 +179,10 @@ void ConfigDirPolicyProviderDelegate::Merge3rdPartyPolicy(
       }
 
       PolicyMap policy;
-      policy.LoadFrom(policy_dictionary, level_, scope_);
+      policy.LoadFrom(policy_dictionary, level, scope_);
       bundle->Get(domain, components_it.key()).MergeFrom(policy);
     }
   }
 }
 
-ConfigDirPolicyProvider::ConfigDirPolicyProvider(
-    const PolicyDefinitionList* policy_list,
-    PolicyLevel level,
-    PolicyScope scope,
-    const FilePath& config_dir)
-    : FileBasedPolicyProvider(
-        policy_list,
-        new ConfigDirPolicyProviderDelegate(config_dir, level, scope)) {}
-
 }  // namespace policy