Removed the PolicyDefinitionList.

chrome/browser/policy/policy_statistics_collector.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/policy_statistics_collector.h"
 
 #include <algorithm>
 #include <string>
 

[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]

This file does use Run(), so added callback.h :-)

 #include "base/bind.h"
 #include "base/location.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/task_runner.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "components/policy/core/common/policy_pref_names.h"
-#include "policy/policy_constants.h"
 
 namespace policy {
 
 const int PolicyStatisticsCollector::kStatisticsUpdateRate =
     24 * 60 * 60 * 1000;  // 24 hours.
 
 PolicyStatisticsCollector::PolicyStatisticsCollector(
+    const GetChromePolicyDetailsCallback& get_details,
+    const Schema& chrome_schema,
     PolicyService* policy_service,
     PrefService* prefs,
     const scoped_refptr<base::TaskRunner>& task_runner)
-    : policy_service_(policy_service),
+    : get_details_(get_details),
+      chrome_schema_(chrome_schema),
+      policy_service_(policy_service),
       prefs_(prefs),
       task_runner_(task_runner) {
 }
 
 PolicyStatisticsCollector::~PolicyStatisticsCollector() {
 }
 
 void PolicyStatisticsCollector::Initialize() {
   using base::Time;
   using base::TimeDelta;
@@ skipping 11 matching lines @@
 // static
 void PolicyStatisticsCollector::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterInt64Pref(policy_prefs::kLastPolicyStatisticsUpdate, 0);
 }
 
 void PolicyStatisticsCollector::RecordPolicyUse(int id) {
   UMA_HISTOGRAM_SPARSE_SLOWLY("Enterprise.Policies", id);
 }
 
 void PolicyStatisticsCollector::CollectStatistics() {
-  const policy::PolicyDefinitionList* policy_list =
-      policy::GetChromePolicyDefinitionList();
   const PolicyMap& policies = policy_service_->GetPolicies(
       PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()));
 
   // Collect statistics.
-  for (const policy::PolicyDefinitionList::Entry* policy = policy_list->begin;
-       policy != policy_list->end; ++policy) {
-    if (policies.Get(policy->name))
-      RecordPolicyUse(policy->id);
+  for (Schema::Iterator it(chrome_schema_.GetPropertiesIterator());
+       !it.IsAtEnd(); it.Advance()) {
+    if (policies.Get(it.key())) {
+      const PolicyDetails* details = get_details_.Run(it.key());
+      if (details)
+        RecordPolicyUse(details->id);
+      else
+        NOTREACHED();

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

Nit: #include "base/logging.h"

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

Done.

+    }
   }
 
   // Take care of next update.
   prefs_->SetInt64(policy_prefs::kLastPolicyStatisticsUpdate,
                    base::Time::Now().ToInternalValue());
   ScheduleUpdate(base::TimeDelta::FromMilliseconds(kStatisticsUpdateRate));
 }
 
 void PolicyStatisticsCollector::ScheduleUpdate(base::TimeDelta delay) {
   update_callback_.Reset(base::Bind(
       &PolicyStatisticsCollector::CollectStatistics,
       base::Unretained(this)));
   task_runner_->PostDelayedTask(FROM_HERE, update_callback_.callback(), delay);
 }
 
 }  // namespace policy