Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 5961 matching lines @@
 #if !defined(ENABLE_CONFIGURATION_POLICY) || defined(OFFICIAL_BUILD)
   reply->SendError("Configuration Policy disabled");
 #else
   const policy::PolicyDefinitionList* list =
       policy::GetChromePolicyDefinitionList();
   policy::BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
   struct {
     std::string name;
     policy::ConfigurationPolicyProvider* provider;
+    policy::PolicyLevel level;
   } providers[] = {
-    { "managed_cloud",        connector->GetManagedCloudProvider()        },
-    { "managed_platform",     connector->GetManagedPlatformProvider()     },
-    { "recommended_cloud",    connector->GetRecommendedCloudProvider()    },
-    { "recommended_platform", connector->GetRecommendedPlatformProvider() }
+    { "managed_cloud",
+      connector->GetManagedCloudProvider(),
+      policy::POLICY_LEVEL_MANDATORY },
+    { "managed_platform",
+      connector->GetManagedPlatformProvider(),
+      policy::POLICY_LEVEL_MANDATORY },
+    { "recommended_cloud",
+      connector->GetRecommendedCloudProvider(),
+      policy::POLICY_LEVEL_RECOMMENDED },
+    { "recommended_platform",
+      connector->GetRecommendedPlatformProvider(),
+      policy::POLICY_LEVEL_RECOMMENDED },
   };
   // Verify if all the requested providers exist before changing anything.
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(providers); ++i) {
     DictionaryValue* policies = NULL;
     if (args->GetDictionary(providers[i].name, &policies) &&
         policies &&
         !providers[i].provider) {
       reply->SendError("Provider not available: " + providers[i].name);
       return;
     }
   }
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(providers); ++i) {
     DictionaryValue* policies = NULL;
     if (args->GetDictionary(providers[i].name, &policies) && policies) {
       policy::PolicyMap* map = new policy::PolicyMap;
-      map->LoadFrom(policies, list);
+      map->LoadFrom(
+          policies, list, providers[i].level, policy::POLICY_SCOPE_USER);

[Mattias Nissler (ping if slow), 2012/01/16 18:23:33]

nitty nit: Putting the first 3 parameters after ( and breaking for the last one
seems more readable to me. Also, is hardcoding POLICY_SCOPE_USER appropriate
here, or should we also make that configurable through the parameter dictionary?

[Joao da Silva, 2012/01/17 13:09:29]

The scope should indeed be configurable. Added an arg for that, and incidentally
it also makes the LoadFrom call fit in one line.

       providers[i].provider->OverridePolicies(map);
     }
   }
 
   // Make sure the policies are in effect before returning. This will go
   // away once all platforms rely on directly installing the policy files and
   // using RefreshPolicies, and SetPolicies is removed.
   PolicyUpdatesObserver::PostCallbackAfterPolicyUpdates(
       base::Bind(&AutomationJSONReply::SendSuccess,
                  base::Owned(reply.release()),
@@ skipping 706 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }