Removed the PolicyDefinitionList.

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 <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
@@ skipping 27 matching lines @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/policy/core/common/policy_pref_names.h"
 #include "components/policy/core/common/schema.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_client.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "grit/generated_resources.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "policy/policy_constants.h"

[bartfab (slow), 2013/11/05 18:18:33]

Nit: policy/policy_constants.h now implicitly pulls in "callback_forward.h", so
all implementation files using it must #include "base/callback.h"

[Joao da Silva, 2013/11/07 20:27:27]

policy_constants.h is not pulling callback_forward.h anymore. Also, this file
doesn't use the Callback class so a forward decl is enough

 #include "third_party/icu/source/i18n/unicode/regex.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/policy/policy_loader_win.h"
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
 #include <CoreFoundation/CoreFoundation.h>
 #include "chrome/browser/policy/policy_loader_mac.h"
 #include "chrome/browser/policy/preferences_mac.h"
 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
@@ skipping 262 matching lines @@
         device_management_service_.get());
   }
 
   GetAppPackUpdater();
 
   SetTimezoneIfPolicyAvailable();
 #endif
 
   policy_statistics_collector_.reset(
       new policy::PolicyStatisticsCollector(
+          base::Bind(&GetChromePolicyDetails),
+          GetChromeSchema(),
           GetPolicyService(),
           local_state_,
           base::MessageLoop::current()->message_loop_proxy()));
   policy_statistics_collector_->Initialize();
 
 #if defined(OS_CHROMEOS)
   network_configuration_updater_ =
       NetworkConfigurationUpdater::CreateForDevicePolicy(
           scoped_ptr<chromeos::onc::CertificateImporter>(
               new chromeos::onc::CertificateImporterImpl),
@@ skipping 231 matching lines @@
                                                &timezone) &&
       !timezone.empty()) {
     chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
         UTF8ToUTF16(timezone));
   }
 #endif
 }
 
 ConfigurationPolicyProvider* BrowserPolicyConnector::CreatePlatformProvider() {
 #if defined(OS_WIN)
-  const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
   scoped_ptr<AsyncPolicyLoader> loader(PolicyLoaderWin::Create(
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
-      policy_list));
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
   return new AsyncPolicyProvider(GetSchemaRegistry(), loader.Pass());
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
-  const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
   scoped_ptr<AsyncPolicyLoader> loader(new PolicyLoaderMac(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
-      policy_list,
       GetManagedPolicyPath(),
       new MacPreferences()));
   return new AsyncPolicyProvider(GetSchemaRegistry(), loader.Pass());
 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
   base::FilePath config_dir_path;
   if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
     scoped_ptr<AsyncPolicyLoader> loader(new ConfigDirPolicyLoader(
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
         config_dir_path,
         POLICY_SCOPE_MACHINE));
     return new AsyncPolicyProvider(GetSchemaRegistry(), loader.Pass());
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy