Refactored ConfigurationPolicyPrefStore to not depend on chrome/.

chrome/browser/prefs/chrome_pref_service_factory.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/prefs/chrome_pref_service_factory.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/default_pref_store.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/pref_notifier_impl.h"
 #include "base/prefs/pref_registry.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_value_store.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/pref_service_syncable_builder.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 40 matching lines @@
   file_util::FileSystemType fstype;
   if (file_util::GetFileSystemType(pref_filename.DirName(), &fstype)) {
     UMA_HISTOGRAM_ENUMERATION("PrefService.FileSystemType",
                               static_cast<int>(fstype),
                               file_util::FILE_SYSTEM_TYPE_COUNT);
   }
 #endif
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   using policy::ConfigurationPolicyPrefStore;
-  builder->WithManagedPrefs(
-      ConfigurationPolicyPrefStore::CreateMandatoryPolicyPrefStore(
-          policy_service));
-  builder->WithRecommendedPrefs(
-      ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore(
-          policy_service));
+  builder->WithManagedPrefs(new ConfigurationPolicyPrefStore(
+      policy_service,
+      g_browser_process->browser_policy_connector()->GetHandlerList(),
+      policy::POLICY_LEVEL_MANDATORY));

[bartfab (slow), 2013/08/12 13:27:53]

Nit: #include "chrome/browser/policy/policy_types.h"

[Joao da Silva, 2013/08/12 15:41:55]

Done.

+  builder->WithRecommendedPrefs(new ConfigurationPolicyPrefStore(
+      policy_service,
+      g_browser_process->browser_policy_connector()->GetHandlerList(),
+      policy::POLICY_LEVEL_RECOMMENDED));
 #endif  // ENABLE_CONFIGURATION_POLICY
 
   builder->WithAsync(async);
   builder->WithExtensionPrefs(extension_prefs.get());
   builder->WithCommandLinePrefs(
       new CommandLinePrefStore(CommandLine::ForCurrentProcess()));
   builder->WithReadErrorCallback(base::Bind(&HandleReadError));
   builder->WithUserPrefs(new JsonPrefStore(pref_filename, pref_io_task_runner));
 }
 
@@ skipping 30 matching lines @@
   PrepareBuilder(&builder,
                  pref_filename,
                  pref_io_task_runner,
                  policy_service,
                  extension_prefs,
                  async);
   return builder.CreateSyncable(pref_registry.get());
 }
 
 }  // namespace chrome_prefs