Chromium Code Reviews| Index: chrome/browser/policy/cloud/user_cloud_policy_store.cc |
| diff --git a/chrome/browser/policy/cloud/user_cloud_policy_store.cc b/chrome/browser/policy/cloud/user_cloud_policy_store.cc |
| index 3fa53d5bfe95acdcd6739ced153b56db06391f63..5921c7f6172ec699e5d72796351f81ea3425558d 100644 |
| --- a/chrome/browser/policy/cloud/user_cloud_policy_store.cc |
| +++ b/chrome/browser/policy/cloud/user_cloud_policy_store.cc |
| @@ -70,7 +70,7 @@ policy::PolicyLoadResult LoadPolicyFromDisk(const base::FilePath& path) { |
| // Stores policy to the backing file (must be called via a task on |
| // the FILE thread). |
| void StorePolicyToDiskOnFileThread(const base::FilePath& path, |
| - const em::PolicyFetchResponse& policy) { |
| + const em::PolicyFetchResponse& policy) { |
|
Joao da Silva
2013/07/23 20:44:47
This is chromium style :-)
You may give clang-for
Steve Condie
2013/07/24 01:42:04
Whoops, didn't mean to change that. In a previous
|
| DVLOG(1) << "Storing policy to " << path.value(); |
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); |
| std::string data; |
| @@ -127,6 +127,7 @@ void UserCloudPolicyStore::Clear() { |
| false)); |
| policy_.reset(); |
| policy_map_.Clear(); |
| + SetPolicyHashValue(0); |
|
Joao da Silva
2013/07/23 20:44:47
NotifyStoreLoaded() could compute this
Steve Condie
2013/07/24 01:42:04
Done.
|
| NotifyStoreLoaded(); |
| } |
| @@ -188,7 +189,10 @@ void UserCloudPolicyStore::InstallLoadedPolicyAfterValidation( |
| validator->policy_data()->request_token(); |
| DVLOG(1) << "Device ID: " << validator->policy_data()->device_id(); |
| - InstallPolicy(validator->policy_data().Pass(), validator->payload().Pass()); |
| + InstallPolicy( |
| + validator->policy_data().Pass(), |
| + validator->payload().Pass(), |
| + validator->hash_value()); |
|
Joao da Silva
2013/07/23 20:44:47
NotifyStoreLoaded can do this :-)
Steve Condie
2013/07/24 01:42:04
Done.
|
| status_ = STATUS_OK; |
| NotifyStoreLoaded(); |
| } |
| @@ -251,7 +255,10 @@ void UserCloudPolicyStore::StorePolicyAfterValidation( |
| content::BrowserThread::FILE, FROM_HERE, |
| base::Bind(&StorePolicyToDiskOnFileThread, |
| backing_file_path_, *validator->policy())); |
| - InstallPolicy(validator->policy_data().Pass(), validator->payload().Pass()); |
| + InstallPolicy( |
| + validator->policy_data().Pass(), |
| + validator->payload().Pass(), |
| + validator->hash_value()); |
|
Joao da Silva
2013/07/23 20:44:47
Same
Steve Condie
2013/07/24 01:42:04
Done.
|
| status_ = STATUS_OK; |
| NotifyStoreLoaded(); |
| } |