Policy providers all get a SchemaRegistry to work with.

chrome/browser/ui/webui/policy_ui.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/ui/webui/policy_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/policy/cloud/cloud_policy_validator.h"
 #include "chrome/browser/policy/cloud/message_util.h"
 #include "chrome/browser/policy/configuration_policy_handler_list.h"
 #include "chrome/browser/policy/policy_error_map.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/policy/policy_types.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
+#include "chrome/browser/policy/schema_map.h"
+#include "chrome/browser/policy/schema_registry_service.h"

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

Nit: Not used (it appears as a return type in
SchemaRegistryServiceFactory::GetForContext() but to be consistent with
yourself, you should not be including a header for a type that you never
dereference).

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

It's needed to see that it's  derived from SchemaRegistry.

+#include "chrome/browser/policy/schema_registry_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "policy/policy_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #endif
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/policy/policy_domain_descriptor.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "components/policy/core/common/schema.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #endif
 
 namespace em = enterprise_management;
 
 namespace {
@@ skipping 473 matching lines @@
       policy::GetChromePolicyDefinitionList();
   for (const policy::PolicyDefinitionList::Entry* entry = list->begin;
        entry != list->end; ++entry) {
     chrome_policy_names->SetBoolean(entry->name, true);
   }
   names.Set("chromePolicyNames", chrome_policy_names);
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   // Add extension policy names.
   base::DictionaryValue* extension_policy_names = new base::DictionaryValue;
+
+  Profile* profile = Profile::FromWebUI(web_ui());
   extensions::ExtensionSystem* extension_system =
-      extensions::ExtensionSystem::Get(Profile::FromWebUI(web_ui()));
+      extensions::ExtensionSystem::Get(profile);
   const ExtensionSet* extensions =
       extension_system->extension_service()->extensions();
-  scoped_refptr<const policy::PolicyDomainDescriptor> policy_domain_descriptor;
-  policy_domain_descriptor = GetPolicyService()->
-      GetPolicyDomainDescriptor(policy::POLICY_DOMAIN_EXTENSIONS);
-  const policy::PolicyDomainDescriptor::SchemaMap& schema_map =
-      policy_domain_descriptor->components();
+
+  policy::SchemaRegistry* registry =

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

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

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

Done.

+      policy::SchemaRegistryServiceFactory::GetForContext(
+          profile->GetOriginalProfile());
+  scoped_refptr<policy::SchemaMap> schema_map = registry->schema_map();
 
   for (ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     const extensions::Extension* extension = it->get();
     // Skip this extension if it's not an enterprise extension.
     if (!extension->manifest()->HasPath(
         extensions::manifest_keys::kStorageManagedSchema))
       continue;
     base::DictionaryValue* extension_value = new base::DictionaryValue;
     extension_value->SetString("name", extension->name());
-    policy::PolicyDomainDescriptor::SchemaMap::const_iterator schema =
-        schema_map.find(extension->id());
+    const policy::Schema* schema =
+        schema_map->GetSchema(policy::PolicyNamespace(
+            policy::POLICY_DOMAIN_EXTENSIONS, extension->id()));

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

Nit: #include "components/policy/core/common/policy_namespace.h"

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

Done.

     base::DictionaryValue* policy_names = new base::DictionaryValue;
-    if (schema != schema_map.end()) {
+    if (schema) {
       // Get policy names from the extension's policy schema.
       // Store in a map, not an array, for faster lookup on JS side.
-      policy::Schema policy_schema = schema->second;
-      for (policy::Schema::Iterator it_policies =
-               policy_schema.GetPropertiesIterator();
-           !it_policies.IsAtEnd(); it_policies.Advance()) {
-        policy_names->SetBoolean(it_policies.key(), true);
+      for (policy::Schema::Iterator prop = schema->GetPropertiesIterator();
+           !prop.IsAtEnd(); prop.Advance()) {
+        policy_names->SetBoolean(prop.key(), true);
       }
     }
     extension_value->Set("policyNames", policy_names);
     extension_policy_names->Set(extension->id(), extension_value);
   }
   names.Set("extensionPolicyNames", extension_policy_names);
 #endif
 
   web_ui()->CallJavascriptFunction("policy.Page.setPolicyNames", names);
 }
@@ skipping 121 matching lines @@
 }
 
 PolicyUI::PolicyUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new PolicyUIHandler);
   content::WebUIDataSource::Add(Profile::FromWebUI(web_ui),
                                 CreatePolicyUIHTMLSource());
 }
 
 PolicyUI::~PolicyUI() {
 }