diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
| commit | eb525c5499e34cc9c4b825d6d9e75bb07cc06ace (patch) | |
| tree | d908ce4bfe1717d2cd53f41327d8b9ba8304355f /chrome/browser/sync/profile_sync_service_factory.cc | |
| parent | 3c54152607de4272b3da0c146b71dcba8a0e5610 (diff) | |
| download | chromium_org-eb525c5499e34cc9c4b825d6d9e75bb07cc06ace.tar.gz | |
Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_factory.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_factory.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc index f43c98846b..d41da39840 100644 --- a/chrome/browser/sync/profile_sync_service_factory.cc +++ b/chrome/browser/sync/profile_sync_service_factory.cc @@ -12,6 +12,7 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/history/history_service_factory.h" +#include "chrome/browser/invalidation/invalidation_service_factory.h" #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -64,6 +65,7 @@ ProfileSyncServiceFactory::ProfileSyncServiceFactory() DependsOn(HistoryServiceFactory::GetInstance()); DependsOn(BookmarkModelFactory::GetInstance()); DependsOn(AboutSigninInternalsFactory::GetInstance()); + DependsOn(invalidation::InvalidationServiceFactory::GetInstance()); // The following have not been converted to BrowserContextKeyedServices yet, // and for now they are explicitly destroyed after the |