Index: chrome/browser/chromeos/policy/device_local_account_policy_service.cc |
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service.cc |
index e11a02f08a78ceab467e19cd19bac76f7e37259e..19a8f3bb6eead6c3e6b05e935a7ccbbee5eedcf4 100644 |
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service.cc |
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service.cc |
@@ -173,11 +173,11 @@ void DeviceLocalAccountPolicyBroker::ConnectIfPossible( |
if (!client) |
return; |
+ CreateComponentCloudPolicyService(request_context, client.get()); |
core_.Connect(client.Pass()); |
external_data_manager_->Connect(request_context); |
core_.StartRefreshScheduler(); |
UpdateRefreshDelay(); |
- CreateComponentCloudPolicyService(request_context); |
} |
void DeviceLocalAccountPolicyBroker::UpdateRefreshDelay() { |
@@ -213,7 +213,8 @@ void DeviceLocalAccountPolicyBroker::OnComponentCloudPolicyUpdated() { |
} |
void DeviceLocalAccountPolicyBroker::CreateComponentCloudPolicyService( |
- const scoped_refptr<net::URLRequestContextGetter>& request_context) { |
+ const scoped_refptr<net::URLRequestContextGetter>& request_context, |
+ CloudPolicyClient* client) { |
if (CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kDisableComponentCloudPolicy)) { |
// Disabled via the command line. |
@@ -229,6 +230,7 @@ void DeviceLocalAccountPolicyBroker::CreateComponentCloudPolicyService( |
this, |
&schema_registry_, |
core(), |
+ client, |
resource_cache.Pass(), |
request_context, |
content::BrowserThread::GetMessageLoopProxyForThread( |