Change PolicyLoaderWin to load PReg files if possible.

chrome/browser/policy/policy_loader_win.h

 // 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.
 
 #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 {
 
 struct PolicyDefinitionList;
 class PolicyMap;
 
 // Loads policies from the Windows registry, and watches for Group Policy
 // notifications to trigger reloads.
 class PolicyLoaderWin : public AsyncPolicyLoader,
                         public base::win::ObjectWatcher::Delegate {
  public:
   explicit PolicyLoaderWin(const PolicyDefinitionList* policy_list);
   virtual ~PolicyLoaderWin();
 
   // AsyncPolicyLoader implementation.
   virtual void InitOnFile() OVERRIDE;
   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();
 
   // ObjectWatcher::Delegate overrides:
   virtual void OnObjectSignaled(HANDLE object) OVERRIDE;
 
   bool is_initialized_;
   const PolicyDefinitionList* policy_list_;
+  base::DictionaryValue chrome_policy_schema_;
 
   base::WaitableEvent user_policy_changed_event_;
   base::WaitableEvent machine_policy_changed_event_;
   base::win::ObjectWatcher user_policy_watcher_;
   base::win::ObjectWatcher machine_policy_watcher_;
   bool user_policy_watcher_failed_;
   bool machine_policy_watcher_failed_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyLoaderWin);
 };
@@ skipping 11 matching lines @@
   // policy.
   extern const wchar_t kRecommended[];
   // Registry key within an extension's namespace that contains the policy
   // schema.
   extern const wchar_t kSchema[];
 }  // namespace registry_constants
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_POLICY_LOADER_WIN_H_