Malformed PortRange or ThirdPartyAuthConfig trigger OnPolicyError.

remoting/host/policy_watcher.h

Index: remoting/host/policy_watcher.h
diff --git a/remoting/host/policy_watcher.h b/remoting/host/policy_watcher.h
index 6b690ab2bc62d4a72453cf8fe4ed9caceb295082..1cd5833009858accb246e5d394b84cda04407a9b 100644
--- a/remoting/host/policy_watcher.h
+++ b/remoting/host/policy_watcher.h
@@ -80,13 +80,20 @@ class PolicyWatcher : public policy::PolicyService::Observer,
  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();