4 files changed, 35 insertions, 0 deletions
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index 5d5d20b..d8e3239 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -275,6 +275,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
   { key::kRemoteAccessHostAllowGnubbyAuth,
     prefs::kRemoteAccessHostAllowGnubbyAuth,
     base::Value::TYPE_BOOLEAN },
+  { key::kRemoteAccessHostAllowRelayedConnection,
+    prefs::kRemoteAccessHostAllowRelayedConnection,
+    base::Value::TYPE_BOOLEAN },
+  { key::kRemoteAccessHostUdpPortRange,
+    prefs::kRemoteAccessHostUdpPortRange,
+    base::Value::TYPE_STRING },
   { key::kCloudPrintProxyEnabled,
     prefs::kCloudPrintProxyEnabled,
     base::Value::TYPE_BOOLEAN },
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index d791e37..cf188b6 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -1883,6 +1883,17 @@ const char kRemoteAccessHostAllowClientPairing[] =
 const char kRemoteAccessHostAllowGnubbyAuth[] =
     "remote_access.host_allow_gnubby_auth";
 
+// Boolean that indicates whether the Chromoting host should allow connections
+// using relay servers.
+const char kRemoteAccessHostAllowRelayedConnection[] =
+    "remote_access.host_allow_relayed_connection";
+
+// String containing the UDP port range that the Chromoting host should used
+// when connecting to clients. The port range should be in the form:
+// <min_port>-<max_port>. E.g. 12400-12409.
+const char kRemoteAccessHostUdpPortRange[] =
+    "remote_access.host_udp_port_range";
+
 // The last used printer and its settings.
 const char kPrintPreviewStickySettings[] =
     "printing.print_preview_sticky_settings";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index e5d9b00..5a9538a 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -628,6 +628,8 @@ extern const char kRemoteAccessHostTalkGadgetPrefix[];
 extern const char kRemoteAccessHostRequireCurtain[];
 extern const char kRemoteAccessHostAllowClientPairing[];
 extern const char kRemoteAccessHostAllowGnubbyAuth[];
+extern const char kRemoteAccessHostAllowRelayedConnection[];
+extern const char kRemoteAccessHostUdpPortRange[];
 
 extern const char kPrintPreviewStickySettings[];
 extern const char kCloudPrintRoot[];
diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json
index e54a6b3..f62c939 100644
--- a/chrome/test/data/policy/policy_test_cases.json
+++ b/chrome/test/data/policy/policy_test_cases.json
@@ -244,6 +244,22 @@
     ]
   },
 
+  "RemoteAccessHostAllowRelayedConnection": {
+    "os": [],
+    "test_policy": { "RemoteAccessHostAllowRelayedConnection": true },
+    "pref_mappings": [
+      { "pref": "remote_access.host_allow_relayed_connection" }
+    ]
+  },
+
+  "RemoteAccessHostUdpPortRange": {
+    "os": [],
+    "test_policy": { "RemoteAccessHostUdpPortRange": "12400-12409" },
+    "pref_mappings": [
+      { "pref": "remote_access.host_udp_port_range" }
+    ]
+  },
+
   "PrintingEnabled": {
     "os": ["win", "linux", "mac", "chromeos"],
     "test_policy": { "PrintingEnabled": false },