Add support for multiple allowed domains

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 <memory>
 
 #include "base/callback.h"
@@ skipping 74 matching lines @@
   // other components.
   static std::unique_ptr<PolicyWatcher> CreateFromPolicyLoaderForTesting(
       std::unique_ptr<policy::AsyncPolicyLoader> async_policy_loader);
 
  private:
   friend class PolicyWatcherTest;
 
   // Gets Chromoting schema stored inside |owned_schema_registry_|.
   const policy::Schema* GetPolicySchema() const;
 
-  // Simplifying wrapper around Schema::Normalize.
+  // Normalizes policies using Schema::Normalize and converts deprecated
+  // policies.
+  //
   // - 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);
 
+  // Converts each deprecated policy to its replacement if and only if the
+  // replacement policy is not set, and removes deprecated policied from dict.
+  void HandleDeprecatedPolicies(base::DictionaryValue* dict);

[pastarmovj, 2017/04/24 13:06:34]

In order to not reinvent the wheel can you try to write a 
LegacyPoliciesDeprecatingPolicyHandler that will do the same thing
https://cs.chromium.org/chromium/src/components/policy/core/browser/configura...
or if this one is too limiting a regular SimplePolicyHandler.

This way you can even completely remove the old prefs in favor of only the new
ones and get the same effect with simpler client code.

[rkjnsn, 2017/04/24 17:20:47]

Unfortunately, I don't believe we can use
LegacyPoliciesDeprecatingPolicyHandler. Chrome Remote Desktop reads and
processes the policy directly, rather than using PolicyHandlers to load them
into prefs.

+
   // Stores |new_policies| into |old_policies_|.  Returns dictionary with items
   // from |new_policies| that are different from the old |old_policies_|.
   std::unique_ptr<base::DictionaryValue> StoreNewAndReturnChangedPolicies(
       std::unique_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
@@ skipping 33 matching lines @@
   std::unique_ptr<policy::SchemaRegistry> owned_schema_registry_;
   std::unique_ptr<policy::ConfigurationPolicyProvider> owned_policy_provider_;
   std::unique_ptr<policy::PolicyService> owned_policy_service_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyWatcher);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_POLICY_WATCHER_H_