Removed ConfigurationPolicyProvider::Provide().

chrome/browser/policy/configuration_policy_provider_delegate_win.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_delegate_win.h"
 
+#include <string>
+
 #include <string.h>
 
 #include "base/basictypes.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/win/registry.h"
+#include "chrome/browser/policy/policy_bundle.h"
+#include "chrome/browser/policy/policy_map.h"
 #include "policy/policy_constants.h"
 
 using base::win::RegKey;
 
 namespace {
 
 bool ReadRegistryStringValue(RegKey* key, const string16& name,
                              string16* result) {
   DWORD value_size = 0;
   DWORD key_type = 0;
@@ skipping 20 matching lines @@
 namespace policy {
 
 ConfigurationPolicyProviderDelegateWin::ConfigurationPolicyProviderDelegateWin(
     const PolicyDefinitionList* policy_definition_list,
     const string16& registry_key,
     PolicyLevel level)
     : policy_definition_list_(policy_definition_list),
       registry_key_(registry_key),
       level_(level) {}
 
-PolicyMap* ConfigurationPolicyProviderDelegateWin::Load() {
-  PolicyMap* result = new PolicyMap();
+scoped_ptr<PolicyBundle> ConfigurationPolicyProviderDelegateWin::Load() {
+  scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
+  PolicyMap& chrome_policy = bundle->Get(POLICY_DOMAIN_CHROME, std::string());
   const PolicyDefinitionList::Entry* current;
   for (current = policy_definition_list_->begin;
        current != policy_definition_list_->end;
        ++current) {
     const string16 name(ASCIIToUTF16(current->name));
     PolicyScope scope = POLICY_SCOPE_MACHINE;
     Value* value = NULL;
     switch (current->value_type) {
       case Value::TYPE_STRING: {
         string16 string_value;
@@ skipping 35 matching lines @@
         // support dictionaries.
         string16 string_value;
         if (GetRegistryPolicyString(name, &string_value, &scope))
           value = base::JSONReader::Read(UTF16ToUTF8(string_value));
         break;
       }
       default:
         NOTREACHED();
     }
     if (value)
-      result->Set(current->name, level_, scope, value);
+      chrome_policy.Set(current->name, level_, scope, value);
   }
-  return result;
+  return bundle.Pass();
 }
 
 bool ConfigurationPolicyProviderDelegateWin::GetRegistryPolicyString(
     const string16& name, string16* result, PolicyScope* scope) const {
   RegKey policy_key(HKEY_LOCAL_MACHINE, registry_key_.c_str(), KEY_READ);
   // First try the global policy.
   if (ReadRegistryStringValue(&policy_key, name, result)) {
     *scope = POLICY_SCOPE_MACHINE;
     return true;
   }
@@ skipping 54 matching lines @@
     if (policy_key.ReadValueDW(value_name.c_str(), &value) == ERROR_SUCCESS) {
       *scope = POLICY_SCOPE_USER;
       *result = value;
       return true;
     }
   }
   return false;
 }
 
 }  // namespace policy