Removed ConfigurationPolicyProvider::Provide().

chrome/browser/policy/configuration_policy_provider_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/configuration_policy_provider_mac.h"
 
+#include <string>
+
 #include "base/file_path.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/sys_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/policy/policy_bundle.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/preferences_mac.h"
 #include "chrome/common/chrome_paths.h"
 #include "policy/policy_constants.h"
 
 using base::mac::CFCast;
 using base::mac::ScopedCFTypeRef;
 
 namespace policy {
 
@@ skipping 52 matching lines @@
     MacPreferences* preferences,
     const PolicyDefinitionList* policy_list,
     PolicyLevel level)
     : FileBasedPolicyProvider::ProviderDelegate(GetManagedPolicyPath()),
       policy_list_(policy_list),
       preferences_(preferences),
       level_(level) {}
 
 MacPreferencesPolicyProviderDelegate::~MacPreferencesPolicyProviderDelegate() {}
 
-PolicyMap* MacPreferencesPolicyProviderDelegate::Load() {
+scoped_ptr<PolicyBundle> MacPreferencesPolicyProviderDelegate::Load() {
   preferences_->AppSynchronize(kCFPreferencesCurrentApplication);
-  PolicyMap* policies = new PolicyMap;
+  scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
+  PolicyMap& chrome_policy = bundle->Get(POLICY_DOMAIN_CHROME, std::string());
 
   const PolicyDefinitionList::Entry* current;
   for (current = policy_list_->begin; current != policy_list_->end; ++current) {
     base::mac::ScopedCFTypeRef<CFStringRef> name(
         base::SysUTF8ToCFStringRef(current->name));
     base::mac::ScopedCFTypeRef<CFPropertyListRef> value(
         preferences_->CopyAppValue(name, kCFPreferencesCurrentApplication));
     if (!value.get())
       continue;
     bool forced =
         preferences_->AppValueIsForced(name, kCFPreferencesCurrentApplication);
     PolicyLevel level = forced ? POLICY_LEVEL_MANDATORY :
                                  POLICY_LEVEL_RECOMMENDED;
     if (level != level_)
       continue;
 
     // TODO(joaodasilva): figure the policy scope.
 
     base::Value* policy = CreateValueFromProperty(value);
     if (policy)
-      policies->Set(current->name, level_, POLICY_SCOPE_USER, policy);
+      chrome_policy.Set(current->name, level_, POLICY_SCOPE_USER, policy);
   }
 
-  return policies;
+  return bundle.Pass();
 }
 
 base::Time MacPreferencesPolicyProviderDelegate::GetLastModification() {
   base::PlatformFileInfo file_info;
   if (!file_util::GetFileInfo(config_file_path(), &file_info) ||
       file_info.is_directory) {
     return base::Time();
   }
 
   return file_info.last_modified;
@@ skipping 56 matching lines @@
     const PolicyDefinitionList* policy_list,
     PolicyLevel level,
     MacPreferences* preferences)
     : FileBasedPolicyProvider(
           policy_list,
           new MacPreferencesPolicyProviderDelegate(preferences,
                                                    policy_list,
                                                    level)) {}
 
 }  // namespace policy