Translate device-local account IDs to user IDs

chrome/browser/chromeos/policy/device_local_account_policy_provider.cc

 // 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 "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
 
 #include "base/bind.h"
 #include "chrome/browser/policy/cloud/cloud_policy_service.h"
 #include "chrome/browser/policy/policy_bundle.h"
 #include "chrome/browser/policy/policy_service.h"
 
 namespace policy {
 
 DeviceLocalAccountPolicyProvider::DeviceLocalAccountPolicyProvider(
-    const std::string& account_id,
+    const std::string& user_id,
     DeviceLocalAccountPolicyService* service)
-    : account_id_(account_id),
+    : user_id_(user_id),
       service_(service),
       store_initialized_(false),
       waiting_for_policy_refresh_(false),
       weak_factory_(this) {
   service_->AddObserver(this);
   UpdateFromBroker();
 }
 
 DeviceLocalAccountPolicyProvider::~DeviceLocalAccountPolicyProvider() {
   service_->RemoveObserver(this);
@@ skipping 12 matching lines @@
     waiting_for_policy_refresh_ = true;
     broker->core()->service()->RefreshPolicy(
         base::Bind(&DeviceLocalAccountPolicyProvider::ReportPolicyRefresh,
                    weak_factory_.GetWeakPtr()));
   } else {
     UpdateFromBroker();
   }
 }
 
 void DeviceLocalAccountPolicyProvider::OnPolicyUpdated(
-    const std::string& account_id) {
-  if (account_id == account_id_)
+    const std::string& user_id) {
+  if (user_id == user_id_)
     UpdateFromBroker();
 }
 
 void DeviceLocalAccountPolicyProvider::OnDeviceLocalAccountsChanged() {
   UpdateFromBroker();
 }
 
 DeviceLocalAccountPolicyBroker* DeviceLocalAccountPolicyProvider::GetBroker() {
-  return service_->GetBrokerForAccount(account_id_);
+  return service_->GetBrokerForUser(user_id_);
 }
 
 void DeviceLocalAccountPolicyProvider::ReportPolicyRefresh(bool success) {
   waiting_for_policy_refresh_ = false;
   UpdateFromBroker();
 }
 
 void DeviceLocalAccountPolicyProvider::UpdateFromBroker() {
   DeviceLocalAccountPolicyBroker* broker = GetBroker();
   scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
@@ skipping 10 matching lines @@
   } else {
     // Keep existing policy, but do send an update.
     waiting_for_policy_refresh_ = false;
     weak_factory_.InvalidateWeakPtrs();
     bundle->CopyFrom(policies());
   }
   UpdatePolicy(bundle.Pass());
 }
 
 }  // namespace policy