Change PolicyLoaderWin to load PReg files if possible.

chrome/browser/policy/policy_loader_win.h

Index: chrome/browser/policy/policy_loader_win.h
diff --git a/chrome/browser/policy/policy_loader_win.h b/chrome/browser/policy/policy_loader_win.h
index 4156ffea2950c7a9fd948af3e03bce54c9673400..26d6d42624139050924812c74920bd516000dddf 100644
--- a/chrome/browser/policy/policy_loader_win.h
+++ b/chrome/browser/policy/policy_loader_win.h
@@ -5,9 +5,13 @@
 #ifndef CHROME_BROWSER_POLICY_POLICY_LOADER_WIN_H_
 #define CHROME_BROWSER_POLICY_POLICY_LOADER_WIN_H_
 
+#include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/values.h"
 #include "base/win/object_watcher.h"
 #include "chrome/browser/policy/async_policy_loader.h"
+#include "chrome/browser/policy/policy_types.h"
 
 namespace policy {
 
@@ -27,8 +31,17 @@ class PolicyLoaderWin : public AsyncPolicyLoader,
   virtual scoped_ptr<PolicyBundle> Load() OVERRIDE;
 
  private:
-  void LoadChromePolicy(PolicyMap* chrome_policies);
-  void Load3rdPartyPolicies(PolicyBundle* bundle);
+  // Parses Chrome policy from |gpo_dict| for the given |scope| and |level| and
+  // merges it into |chrome_policy_map|.
+  void LoadChromePolicy(const base::DictionaryValue* gpo_dict,
+                        PolicyLevel level,
+                        PolicyScope scope,
+                        PolicyMap* chrome_policy_map);
+
+  // Loads 3rd-party policy from gpo_dict and merges it into |bundle|.

[Joao da Silva, 2013/04/05 13:55:01]

nit: |gpo_dict|

[Mattias Nissler (ping if slow), 2013/04/09 22:43:38]

Done.

+  void Load3rdPartyPolicy(const base::DictionaryValue* gpo_dict,
+                          PolicyScope scope,
+                          PolicyBundle* bundle);
 
   // Installs the watchers for the Group Policy update events.
   void SetupWatches();
@@ -38,6 +51,7 @@ class PolicyLoaderWin : public AsyncPolicyLoader,
 
   bool is_initialized_;
   const PolicyDefinitionList* policy_list_;
+  base::DictionaryValue chrome_policy_schema_;
 
   base::WaitableEvent user_policy_changed_event_;
   base::WaitableEvent machine_policy_changed_event_;