[Chromoting] Let the Mac host policy watcher read string-valued policies.

remoting/host/policy_hack/policy_watcher_mac.mm

 // Copyright (c) 2012 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.
 
 #include "remoting/host/policy_hack/policy_watcher.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "base/compiler_specific.h"
+#include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/sys_string_conversions.h"
 #include "base/values.h"
 
 namespace remoting {
 namespace policy_hack {
 
 // The MacOS version does not watch files because it is accepted
@@ skipping 29 matching lines @@
         base::mac::ScopedCFTypeRef<CFStringRef> policy_key(
             base::SysUTF8ToCFStringRef(policy_name));
         Boolean valid = false;
         bool allowed = CFPreferencesGetAppBooleanValue(policy_key,
                                                        policy_bundle_id,
                                                        &valid);
         if (valid) {
           policy.SetBoolean(policy_name, allowed);
         }
       }
-      // TODO(simonmorris): Read policies whose names are in kStringPolicyNames.
+      for (int i = 0; i < kStringPolicyNamesNum; ++i) {
+        const char* policy_name = kStringPolicyNames[i];
+        base::mac::ScopedCFTypeRef<CFStringRef> policy_key(
+            base::SysUTF8ToCFStringRef(policy_name));
+        base::mac::ScopedCFTypeRef<CFPropertyListRef> property_list(
+            CFPreferencesCopyAppValue(policy_key, policy_bundle_id));
+        if (property_list.get() != NULL) {
+          CFStringRef policy_value = base::mac::CFCast<CFStringRef>(
+              property_list.get());
+          if (policy_value != NULL) {
+            policy.SetString(policy_name,
+                             base::SysCFStringRefToUTF8(policy_value));
+          } else {
+            LOG(WARNING) << "Policy " << policy_name << ": value not a string.";
+          }
+        }
+      }
     }
 
     // Set policy. Policy must be set (even if it is empty) so that the
     // default policy is picked up the first time reload is called.
     UpdatePolicies(&policy);
 
     // Reschedule task.
     ScheduleFallbackReloadTask();
   }
 };
 
 PolicyWatcher* PolicyWatcher::Create(
         scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
   return new PolicyWatcherMac(task_runner);
 }
 
 }  // namespace policy_hack
 }  // namespace remoting