Malformed PortRange or ThirdPartyAuthConfig trigger OnPolicyError.

remoting/host/policy_watcher.h

 // Copyright 2015 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 REMOTING_HOST_POLICY_WATCHER_H_
 #define REMOTING_HOST_POLICY_WATCHER_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 62 matching lines @@
   // policy from files / registry / preferences (although (2) is just an
   // implementation detail and should likely be ignored outside of
   // PolicyWatcher).
   static scoped_ptr<PolicyWatcher> Create(
       policy::PolicyService* policy_service,
       const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner);
 
  private:
   friend class PolicyWatcherTest;
 
-  // Takes the policy dictionary from the OS specific store and extracts the
-  // relevant policies.
-  void UpdatePolicies(const base::DictionaryValue* new_policy);
-
   // Gets Chromoting schema stored inside |owned_schema_registry_|.
   const policy::Schema* GetPolicySchema() const;
 
+  // Simplifying wrapper around Schema::Normalize.
+  // - Returns false if |dict| is invalid (i.e. contains mistyped policy
+  // values).
+  // - Returns true if |dict| was valid or got normalized.
+  bool NormalizePolicies(base::DictionaryValue* dict);
+
+  // Stores |new_policies| into |old_policies_|.  Returns dictionary with items
+  // from |new_policies| that are different from the old |old_policies_|.
+  scoped_ptr<base::DictionaryValue> StoreNewAndReturnChangedPolicies(
+      scoped_ptr<base::DictionaryValue> new_policies);
+
   // Signals policy error to the registered |PolicyErrorCallback|.
   void SignalPolicyError();
 
   // |policy_service_task_runner| is the task runner where it is safe
   // to call |policy_service_| methods and where we expect to get callbacks
   // from |policy_service_|.
   PolicyWatcher(
       policy::PolicyService* policy_service,
       scoped_ptr<policy::PolicyService> owned_policy_service,
       scoped_ptr<policy::ConfigurationPolicyProvider> owned_policy_provider,
@@ skipping 28 matching lines @@
   scoped_ptr<policy::SchemaRegistry> owned_schema_registry_;
   scoped_ptr<policy::ConfigurationPolicyProvider> owned_policy_provider_;
   scoped_ptr<policy::PolicyService> owned_policy_service_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyWatcher);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_POLICY_WATCHER_H_