| Index: chrome/browser/policy/device_management_policy_cache.cc
|
| diff --git a/chrome/browser/policy/device_management_policy_cache.cc b/chrome/browser/policy/device_management_policy_cache.cc
|
| index ab5dd15ae5920c40f474e2cf5d4946c2875ab7c2..897c10cd389f426abec7df157a6097d4613ce780 100644
|
| --- a/chrome/browser/policy/device_management_policy_cache.cc
|
| +++ b/chrome/browser/policy/device_management_policy_cache.cc
|
| @@ -104,7 +104,7 @@ void DeviceManagementPolicyCache::LoadPolicyFromFile() {
|
| // Decode and swap in the new policy information.
|
| scoped_ptr<DictionaryValue> value(DecodePolicy(cached_policy.policy()));
|
| {
|
| - AutoLock lock(lock_);
|
| + base::AutoLock lock(lock_);
|
| if (!fresh_policy_)
|
| policy_.reset(value.release());
|
| last_policy_refresh_time_ = timestamp;
|
| @@ -118,7 +118,7 @@ bool DeviceManagementPolicyCache::SetPolicy(
|
| const bool new_policy_differs = !(value->Equals(policy_.get()));
|
| base::Time now(base::Time::NowFromSystemTime());
|
| {
|
| - AutoLock lock(lock_);
|
| + base::AutoLock lock(lock_);
|
| policy_.reset(value);
|
| fresh_policy_ = true;
|
| last_policy_refresh_time_ = now;
|
| @@ -134,7 +134,7 @@ bool DeviceManagementPolicyCache::SetPolicy(
|
| }
|
|
|
| DictionaryValue* DeviceManagementPolicyCache::GetPolicy() {
|
| - AutoLock lock(lock_);
|
| + base::AutoLock lock(lock_);
|
| return static_cast<DictionaryValue*>(policy_->DeepCopy());
|
| }
|
|
|
| @@ -146,7 +146,7 @@ void DeviceManagementPolicyCache::SetDeviceUnmanaged(bool is_device_unmanaged) {
|
| base::Time now(base::Time::NowFromSystemTime());
|
| DictionaryValue* empty = new DictionaryValue();
|
| {
|
| - AutoLock lock(lock_);
|
| + base::AutoLock lock(lock_);
|
| policy_.reset(empty);
|
| last_policy_refresh_time_ = now;
|
| }
|
|
|