Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3100)

Unified Diff: chrome/browser/policy/browser_policy_connector.cc

Issue 12183017: Verify the signature on user cloud policy downloads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index d45ed87501a811fea10603f1943b518e2844758e..2ea74a6b910b13f454075a5aa029490dbf2558c7 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -255,6 +255,8 @@ void BrowserPolicyConnector::InitializeUserPolicy(
const FilePath policy_dir = profile_dir.Append(kPolicyDir);
const FilePath policy_cache_file = policy_dir.Append(kPolicyCacheFile);
const FilePath token_cache_file = policy_dir.Append(kTokenCacheFile);
+ FilePath policy_key_dir;
+ PathService::Get(chrome::DIR_USER_POLICY_KEYS, &policy_key_dir);
if (wait_for_policy_fetch)
device_management_service_->ScheduleInitialization(0);
@@ -269,8 +271,9 @@ void BrowserPolicyConnector::InitializeUserPolicy(
} else if (!IsNonEnterpriseUser(user_name)) {
scoped_ptr<CloudPolicyStore> store(
new UserCloudPolicyStoreChromeOS(
+ chromeos::DBusThreadManager::Get()->GetCryptohomeClient(),
chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
- user_name, token_cache_file, policy_cache_file));
+ user_name, policy_key_dir, token_cache_file, policy_cache_file));
user_cloud_policy_manager_.reset(
new UserCloudPolicyManagerChromeOS(store.Pass(),
wait_for_policy_fetch));

Powered by Google App Engine
This is Rietveld 408576698