Removed the PolicyDefinitionList from the ConfigurationPolicyProvider interface.

chrome/browser/policy/browser_policy_connector.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/browser_policy_connector.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 119 matching lines @@
   // cloud policy on the Desktop requires a refactoring of the cloud provider,
   // but for now it just isn't created.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDeviceManagementUrl)) {
     device_management_service_.reset(
         new DeviceManagementService(
             command_line->GetSwitchValueASCII(switches::kDeviceManagementUrl)));
     if (!command_line->HasSwitch(switches::kEnableCloudPolicyService)) {
       managed_cloud_provider_.reset(new CloudPolicyProvider(
           this,
-          GetChromePolicyDefinitionList(),
           POLICY_LEVEL_MANDATORY));
       recommended_cloud_provider_.reset(new CloudPolicyProvider(
           this,
-          GetChromePolicyDefinitionList(),
           POLICY_LEVEL_RECOMMENDED));
     }
   }
 
   InitializeDevicePolicy();
 
   // Create the AppPackUpdater to start updating the cache. It requires the
   // system request context, which isn't available yet; therefore it is
   // created only once the loops are running.
   MessageLoop::current()->PostTask(
@@ skipping 391 matching lines @@
   }
   device_data_store_->set_device_status_collector(
       new DeviceStatusCollector(
           g_browser_process->local_state(),
           chromeos::system::StatisticsProvider::GetInstance(),
           NULL));
 #endif
 }
 
 // static
-ConfigurationPolicyProvider*
-    BrowserPolicyConnector::CreatePlatformProvider() {
+ConfigurationPolicyProvider* BrowserPolicyConnector::CreatePlatformProvider() {
+#if defined(OS_WIN)
   const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
-#if defined(OS_WIN)
   scoped_ptr<AsyncPolicyLoader> loader(new PolicyLoaderWin(policy_list));
-  return new AsyncPolicyProvider(policy_list, loader.Pass());
+  return new AsyncPolicyProvider(loader.Pass());
 #elif defined(OS_MACOSX)
+  const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
   scoped_ptr<AsyncPolicyLoader> loader(
       new PolicyLoaderMac(policy_list, new MacPreferences()));
-  return new AsyncPolicyProvider(policy_list, loader.Pass());
+  return new AsyncPolicyProvider(loader.Pass());
 #elif defined(OS_POSIX)
   FilePath config_dir_path;
   if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
     scoped_ptr<AsyncPolicyLoader> loader(
         new ConfigDirPolicyLoader(config_dir_path, POLICY_SCOPE_MACHINE));
-    return new AsyncPolicyProvider(policy_list, loader.Pass());
+    return new AsyncPolicyProvider(loader.Pass());
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy