Use AccountIdKey to identify Active Directory accounts.

chromeos/dbus/auth_policy_client.cc

 // Copyright 2016 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 "chromeos/dbus/auth_policy_client.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
@@ skipping 53 matching lines @@
     dbus::MethodCall method_call(authpolicy::kAuthPolicyInterface,
                                  authpolicy::kAuthPolicyRefreshDevicePolicy);
     proxy_->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&AuthPolicyClientImpl::HandleRefreshPolicyCallback,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
   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,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
  protected:
   void Init(dbus::Bus* bus) override {
     bus_ = bus;
     proxy_ = bus_->GetObjectProxy(
@@ skipping 54 matching lines @@
 AuthPolicyClient::AuthPolicyClient() {}
 
 AuthPolicyClient::~AuthPolicyClient() {}
 
 // static
 AuthPolicyClient* AuthPolicyClient::Create() {
   return new AuthPolicyClientImpl();
 }
 
 }  // namespace chromeos