Translate device-local account IDs to user IDs

chrome/browser/chromeos/policy/device_local_account_policy_provider.h

Index: chrome/browser/chromeos/policy/device_local_account_policy_provider.h
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.h b/chrome/browser/chromeos/policy/device_local_account_policy_provider.h
index 4728215d3dce886f545a8e5c72543ee985e56130..6dbd13c5a15ea45ce068bc592d3df4dabd5c65a7 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.h
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.h
@@ -24,7 +24,7 @@ class DeviceLocalAccountPolicyProvider
     : public ConfigurationPolicyProvider,
       public DeviceLocalAccountPolicyService::Observer {
  public:
-  DeviceLocalAccountPolicyProvider(const std::string& account_id,
+  DeviceLocalAccountPolicyProvider(const std::string& user_id,
                                    DeviceLocalAccountPolicyService* service);
   virtual ~DeviceLocalAccountPolicyProvider();
 
@@ -33,11 +33,11 @@ class DeviceLocalAccountPolicyProvider
   virtual void RefreshPolicies() OVERRIDE;
 
   // DeviceLocalAccountPolicyService::Observer:
-  virtual void OnPolicyUpdated(const std::string& account_id) OVERRIDE;
+  virtual void OnPolicyUpdated(const std::string& user_id) OVERRIDE;
   virtual void OnDeviceLocalAccountsChanged() OVERRIDE;
 
  private:
-  // Returns the broker for |account_id_| or NULL if not available.
+  // Returns the broker for |user_id_| or NULL if not available.
   DeviceLocalAccountPolicyBroker* GetBroker();
 
   // Handles completion of policy refreshes and triggers the update callback.
@@ -48,7 +48,7 @@ class DeviceLocalAccountPolicyProvider
   // policy from the broker if available or keeping the current policy.
   void UpdateFromBroker();
 
-  const std::string account_id_;
+  const std::string user_id_;
   DeviceLocalAccountPolicyService* service_;
 
   bool store_initialized_;