Policy providers all get a SchemaRegistry to work with.

chrome/browser/policy/policy_loader_mac.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/policy_loader_mac.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/path_service.h"
 #include "base/platform_file.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/policy/external_data_fetcher.h"
 #include "chrome/browser/policy/policy_bundle.h"
-#include "chrome/browser/policy/policy_domain_descriptor.h"
 #include "chrome/browser/policy/policy_load_status.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/preferences_mac.h"
 #include "components/policy/core/common/schema.h"
 #include "policy/policy_constants.h"
 
 using base::mac::CFCast;
 using base::ScopedCFTypeRef;
 
 namespace policy {
@@ skipping 46 matching lines @@
         managed_policy_path_, false,
         base::Bind(&PolicyLoaderMac::OnFileUpdated, base::Unretained(this)));
   }
 }
 
 scoped_ptr<PolicyBundle> PolicyLoaderMac::Load() {
   preferences_->AppSynchronize(kCFPreferencesCurrentApplication);
   scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
 
   // Load Chrome's policy.
-  // TODO(joaodasilva): use a schema for Chrome once it's generated and
-  // available from a PolicyDomainDescriptor.
+  // TODO(joaodasilva): use the Chrome schema instead of the
+  // PolicyDefinitionList.
   PolicyMap& chrome_policy =
       bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()));
 
   PolicyLoadStatusSample status;
   bool policy_present = false;
   const PolicyDefinitionList::Entry* current;
   for (current = policy_list_->begin; current != policy_list_->end; ++current) {
     base::ScopedCFTypeRef<CFStringRef> name(
         base::SysUTF8ToCFStringRef(current->name));
     base::ScopedCFTypeRef<CFPropertyListRef> value(
@@ skipping 10 matching lines @@
     if (policy)
       chrome_policy.Set(current->name, level, POLICY_SCOPE_USER, policy, NULL);
     else
       status.Add(POLICY_LOAD_STATUS_PARSE_ERROR);
   }
 
   if (!policy_present)
     status.Add(POLICY_LOAD_STATUS_NO_POLICY);
 
   // Load policy for the registered components.
-  static const struct {
-    PolicyDomain domain;
-    const char* domain_name;
-  } kSupportedDomains[] = {
-    { POLICY_DOMAIN_EXTENSIONS, "extensions" },
-  };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kSupportedDomains); ++i) {
-    DescriptorMap::const_iterator it =
-        descriptor_map().find(kSupportedDomains[i].domain);
-    if (it != descriptor_map().end()) {
-      LoadPolicyForDomain(
-          it->second, kSupportedDomains[i].domain_name, bundle.get());
-    }
-  }
+  LoadPolicyForDomain(POLICY_DOMAIN_EXTENSIONS, "extensions", bundle.get());
 
   return bundle.Pass();
 }
 
 base::Time PolicyLoaderMac::LastModificationTime() {
   base::PlatformFileInfo file_info;
   if (!file_util::GetFileInfo(managed_policy_path_, &file_info) ||
       file_info.is_directory) {
     return base::Time();
   }
@@ skipping 39 matching lines @@
                          CFRangeMake(0, CFArrayGetCount(array)),
                          ArrayEntryToValue,
                          list_value);
     return list_value;
   }
 
   return NULL;
 }
 
 void PolicyLoaderMac::LoadPolicyForDomain(
-    scoped_refptr<const PolicyDomainDescriptor> descriptor,
+    PolicyDomain domain,
     const std::string& domain_name,
     PolicyBundle* bundle) {
   std::string id_prefix(base::mac::BaseBundleID());
   id_prefix.append(".").append(domain_name).append(".");
 
-  for (PolicyDomainDescriptor::SchemaMap::const_iterator it_schema =
-           descriptor->components().begin();
-       it_schema != descriptor->components().end(); ++it_schema) {
+  const ComponentMap* components = schema_map()->GetComponents(domain);

[bartfab (slow), 2013/11/05 15:53:04]

Nit: #include "chrome/browser/policy/schema_map.h"

[Joao da Silva, 2013/11/07 13:15:00]

Done.

+  if (!components)
+    return;
+
+  for (ComponentMap::const_iterator it = components->begin();
+       it != components->end(); ++it) {
     PolicyMap policy;
-    LoadPolicyForComponent(
-        id_prefix + it_schema->first, it_schema->second, &policy);
-    if (!policy.empty()) {
-      bundle->Get(PolicyNamespace(descriptor->domain(), it_schema->first))
-          .Swap(&policy);
-    }
+    LoadPolicyForComponent(id_prefix + it->first, it->second, &policy);
+    if (!policy.empty())
+      bundle->Get(PolicyNamespace(domain, it->first)).Swap(&policy);
   }
 }
 
 void PolicyLoaderMac::LoadPolicyForComponent(
     const std::string& bundle_id_string,
-    Schema schema,
+    const Schema& schema,
     PolicyMap* policy) {
-  // TODO(joaodasilva): extensions may be registered in a PolicyDomainDescriptor
+  // TODO(joaodasilva): extensions may be registered in a ComponentMap

[bartfab (slow), 2013/11/05 15:53:04]

Nit: Capitalize start of sentence.

[Joao da Silva, 2013/11/07 13:15:00]

Done.

   // without a schema, to allow a graceful update of the Legacy Browser Support
   // extension on Windows. Remove this check once that support is removed.
   if (!schema.valid())
     return;
 
   base::ScopedCFTypeRef<CFStringRef> bundle_id(
       base::SysUTF8ToCFStringRef(bundle_id_string));
   preferences_->AppSynchronize(bundle_id);
 
   for (Schema::Iterator it = schema.GetPropertiesIterator();
@@ skipping 15 matching lines @@
     }
   }
 }
 
 void PolicyLoaderMac::OnFileUpdated(const base::FilePath& path, bool error) {
   if (!error)
     Reload(false);
 }
 
 }  // namespace policy