Chromium Code Reviews| Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc |
| diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc |
| index 0cb76ccdebc3105c0be8a5d6d0d958dc745f2676..b655c2615134a3e6b44b68650a2035dbaab918ea 100644 |
| --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc |
| +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc |
| @@ -14,6 +14,7 @@ |
| #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" |
| #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h" |
| #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| +#include "chrome/browser/invalidation/invalidation_service_factory.h" |
| #include "chrome/browser/policy/browser_policy_connector.h" |
| #include "chrome/browser/policy/cloud/device_management_service.h" |
| #include "chrome/browser/policy/cloud/resource_cache.h" |
| @@ -68,7 +69,9 @@ scoped_ptr<UserCloudPolicyManagerChromeOS> |
| UserCloudPolicyManagerFactoryChromeOS::UserCloudPolicyManagerFactoryChromeOS() |
| : BrowserContextKeyedBaseFactory( |
| "UserCloudPolicyManagerChromeOS", |
| - BrowserContextDependencyManager::GetInstance()) {} |
| + BrowserContextDependencyManager::GetInstance()) { |
| + DependsOn(invalidation::InvalidationServiceFactory::GetInstance()); |
|
Joao da Silva
2013/07/24 15:34:07
I just realized that we can't do this.
Basically
Steve Condie
2013/07/25 01:18:08
Done.
|
| +} |
| UserCloudPolicyManagerFactoryChromeOS:: |
| ~UserCloudPolicyManagerFactoryChromeOS() {} |
| @@ -143,9 +146,11 @@ scoped_ptr<UserCloudPolicyManagerChromeOS> |
| if (command_line->HasSwitch(switches::kEnableComponentCloudPolicy)) |
| resource_cache.reset(new ResourceCache(resource_cache_dir)); |
| scoped_ptr<UserCloudPolicyManagerChromeOS> manager( |
| - new UserCloudPolicyManagerChromeOS(store.Pass(), |
| - resource_cache.Pass(), |
| - wait_for_initial_policy)); |
| + new UserCloudPolicyManagerChromeOS( |
| + store.Pass(), |
| + resource_cache.Pass(), |
| + wait_for_initial_policy, |
| + invalidation::InvalidationServiceFactory::GetForProfile(profile))); |
| manager->Init(); |
| manager->Connect(g_browser_process->local_state(), |
| device_management_service, |