Use AccountIdKey to identify Active Directory accounts.

chromeos/dbus/auth_policy_client.cc

Index: chromeos/dbus/auth_policy_client.cc
diff --git a/chromeos/dbus/auth_policy_client.cc b/chromeos/dbus/auth_policy_client.cc
index f3181c9b7b534db94917366835d4edb0678e8fa1..43578e3f67470183c8f91813253e192220a804a6 100644
--- a/chromeos/dbus/auth_policy_client.cc
+++ b/chromeos/dbus/auth_policy_client.cc
@@ -71,12 +71,11 @@ class AuthPolicyClientImpl : public AuthPolicyClient {
 
   void RefreshUserPolicy(const AccountId& account_id,
                          const RefreshPolicyCallback& callback) override {
+    DCHECK(account_id.GetAccountType() == AccountType::ACTIVE_DIRECTORY);
     dbus::MethodCall method_call(authpolicy::kAuthPolicyInterface,
                                  authpolicy::kAuthPolicyRefreshUserPolicy);
     dbus::MessageWriter writer(&method_call);
-    // TODO(tnagel): Switch to GUID once authpolicyd, session_manager and
-    // cryptohome support it, cf. https://crbug.com/677497.
-    writer.AppendString(account_id.GetUserEmail());
+    writer.AppendString(account_id.GetAccountIdKey());
     proxy_->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&AuthPolicyClientImpl::HandleRefreshPolicyCallback,