diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
| commit | 7dbb3d5cf0c15f500944d211057644d6a2f37371 (patch) | |
| tree | 701119ba0596f51b0ab466d6472b0f98211359c5 /chrome/browser/sync/profile_sync_service_factory.cc | |
| parent | b2ecf4836a0eb284ddac7746b1f7ba613777a739 (diff) | |
| download | chromium_org-7dbb3d5cf0c15f500944d211057644d6a2f37371.tar.gz | |
Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_factory.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_factory.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc index d41da39840..a6fb984b7e 100644 --- a/chrome/browser/sync/profile_sync_service_factory.cc +++ b/chrome/browser/sync/profile_sync_service_factory.cc @@ -19,6 +19,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/sessions/tab_restore_service_factory.h" #include "chrome/browser/signin/about_signin_internals_factory.h" +#include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/profile_sync_components_factory_impl.h" @@ -52,20 +53,21 @@ ProfileSyncServiceFactory::ProfileSyncServiceFactory() // The ProfileSyncService depends on various SyncableServices being around // when it is shut down. Specify those dependencies here to build the proper // destruction order. - DependsOn(TemplateURLServiceFactory::GetInstance()); + DependsOn(AboutSigninInternalsFactory::GetInstance()); DependsOn(autofill::PersonalDataManagerFactory::GetInstance()); + DependsOn(BookmarkModelFactory::GetInstance()); + DependsOn(extensions::ExtensionSystemFactory::GetInstance()); + DependsOn(GlobalErrorServiceFactory::GetInstance()); + DependsOn(HistoryServiceFactory::GetInstance()); + DependsOn(invalidation::InvalidationServiceFactory::GetInstance()); + DependsOn(PasswordStoreFactory::GetInstance()); + DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance()); + DependsOn(SigninManagerFactory::GetInstance()); + DependsOn(TemplateURLServiceFactory::GetInstance()); #if defined(ENABLE_THEMES) DependsOn(ThemeServiceFactory::GetInstance()); #endif - DependsOn(GlobalErrorServiceFactory::GetInstance()); - DependsOn(SigninManagerFactory::GetInstance()); - DependsOn(PasswordStoreFactory::GetInstance()); - DependsOn(extensions::ExtensionSystemFactory::GetInstance()); DependsOn(WebDataServiceFactory::GetInstance()); - 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 |