[Chromoting] Add new Chromoting enterprise policies

remoting/host/policy_hack/policy_watcher.cc

Index: remoting/host/policy_hack/policy_watcher.cc
diff --git a/remoting/host/policy_hack/policy_watcher.cc b/remoting/host/policy_hack/policy_watcher.cc
index 6ee7c6a2a89f025ca5bb1e3ee2fe2a56e427b426..0d197729c4784f350473e31dc704fc18d64bd39b 100644
--- a/remoting/host/policy_hack/policy_watcher.cc
+++ b/remoting/host/policy_hack/policy_watcher.cc
@@ -15,6 +15,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
 #include "base/values.h"
+#include "remoting/host/constants.h"
 
 namespace remoting {
 namespace policy_hack {
@@ -89,13 +90,13 @@ scoped_ptr<base::DictionaryValue> AddDefaultValuesWhenNecessary(
   CopyBooleanOrDefault(to.get(), from,
                        PolicyWatcher::kNatPolicyName, true, false);
   CopyBooleanOrDefault(to.get(), from,
-                       PolicyWatcher::kRequireTwoFactorPolicyName,
+                       PolicyWatcher::kHostRequireTwoFactorPolicyName,
                        false, false);
   CopyStringOrDefault(to.get(), from,
                       PolicyWatcher::kHostDomainPolicyName, "", "");
   CopyStringOrDefault(to.get(), from,
-                      PolicyWatcher::kTalkGadgetPolicyName,
-                      "chromoting", "chromoting");
+                      PolicyWatcher::kHostTalkGadgetPrefixPolicyName,
+                      kDefaultTalkGadgetPrefix, kDefaultTalkGadgetPrefix);
 
   return to.Pass();
 }
@@ -105,18 +106,18 @@ scoped_ptr<base::DictionaryValue> AddDefaultValuesWhenNecessary(
 const char PolicyWatcher::kNatPolicyName[] =
     "RemoteAccessHostFirewallTraversal";
 
-const char PolicyWatcher::kRequireTwoFactorPolicyName[] =
+const char PolicyWatcher::kHostRequireTwoFactorPolicyName[] =
     "RemoteAccessHostRequireTwoFactor";
 
 const char PolicyWatcher::kHostDomainPolicyName[] =
     "RemoteAccessHostDomain";
 
-const char PolicyWatcher::kTalkGadgetPolicyName[] =
-    "RemoteAccessHostTalkGadget";
+const char PolicyWatcher::kHostTalkGadgetPrefixPolicyName[] =
+    "RemoteAccessHostTalkGadgetPrefix";
 
 const char* const PolicyWatcher::kBooleanPolicyNames[] =
     { PolicyWatcher::kNatPolicyName,
-      PolicyWatcher::kRequireTwoFactorPolicyName
+      PolicyWatcher::kHostRequireTwoFactorPolicyName
     };
 
 const int PolicyWatcher::kBooleanPolicyNamesNum =
@@ -124,7 +125,7 @@ const int PolicyWatcher::kBooleanPolicyNamesNum =
 
 const char* const PolicyWatcher::kStringPolicyNames[] =
     { PolicyWatcher::kHostDomainPolicyName,
-      PolicyWatcher::kTalkGadgetPolicyName
+      PolicyWatcher::kHostTalkGadgetPrefixPolicyName
     };
 
 const int PolicyWatcher::kStringPolicyNamesNum =