| Index: chrome/browser/policy/profile_policy_connector_factory.cc
|
| diff --git a/chrome/browser/policy/profile_policy_connector_factory.cc b/chrome/browser/policy/profile_policy_connector_factory.cc
|
| index 9d052606f472925a00424ec272d2cf4d5bf3f097..6c8dc52d49d7c5057ec6528441bbecaa61a7c510 100644
|
| --- a/chrome/browser/policy/profile_policy_connector_factory.cc
|
| +++ b/chrome/browser/policy/profile_policy_connector_factory.cc
|
| @@ -38,9 +38,12 @@ scoped_ptr<ProfilePolicyConnector>
|
| ProfilePolicyConnectorFactory::CreateForProfile(
|
| Profile* profile,
|
| bool force_immediate_load,
|
| + CloudPolicyManager* user_cloud_policy_manager,
|
| base::SequencedTaskRunner* sequenced_task_runner) {
|
| - return GetInstance()->CreateForProfileInternal(
|
| - profile, force_immediate_load, sequenced_task_runner);
|
| + return GetInstance()->CreateForProfileInternal(profile,
|
| + force_immediate_load,
|
| + user_cloud_policy_manager,
|
| + sequenced_task_runner);
|
| }
|
|
|
| void ProfilePolicyConnectorFactory::SetServiceForTesting(
|
| @@ -82,12 +85,16 @@ scoped_ptr<ProfilePolicyConnector>
|
| ProfilePolicyConnectorFactory::CreateForProfileInternal(
|
| Profile* profile,
|
| bool force_immediate_load,
|
| + CloudPolicyManager* user_cloud_policy_manager,
|
| base::SequencedTaskRunner* sequenced_task_runner) {
|
| DCHECK(connectors_.find(profile) == connectors_.end());
|
| - ProfilePolicyConnector* connector = new ProfilePolicyConnector(profile);
|
| - connector->Init(force_immediate_load, sequenced_task_runner);
|
| + ProfilePolicyConnector* connector = new ProfilePolicyConnector();
|
| + connector->Init(force_immediate_load,
|
| + user_cloud_policy_manager,
|
| + profile,
|
| + sequenced_task_runner);
|
| connectors_[profile] = connector;
|
| - return scoped_ptr<ProfilePolicyConnector>(connector);
|
| + return make_scoped_ptr(connector);
|
| }
|
|
|
| void ProfilePolicyConnectorFactory::BrowserContextShutdown(
|
|
|