diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 17:44:13 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 17:44:13 +0000 |
| commit | 461a9ff9b73bc961a7a3a734368b5d681bcc8fc4 (patch) | |
| tree | e6ebdf40fe6fceba33c56de3d14479b3fcd8d4ba /chrome/browser/sync | |
| parent | a42acc9f139ce472beb6b0798b4747733c32f874 (diff) | |
| download | chromium_src-461a9ff9b73bc961a7a3a734368b5d681bcc8fc4.zip chromium_src-461a9ff9b73bc961a7a3a734368b5d681bcc8fc4.tar.gz chromium_src-461a9ff9b73bc961a7a3a734368b5d681bcc8fc4.tar.bz2 | |
Add dependencies on HistoryService/BookmarkModel.
BUG=97804,112525
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10535113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_factory.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc index 7ef2275..8aba534 100644 --- a/chrome/browser/sync/profile_sync_service_factory.cc +++ b/chrome/browser/sync/profile_sync_service_factory.cc @@ -6,13 +6,15 @@ #include "base/command_line.h" #include "base/memory/singleton.h" -#include "chrome/browser/defaults.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" +#include "chrome/browser/bookmarks/bookmark_model_factory.h" +#include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_system_factory.h" +#include "chrome/browser/history/history_service_factory.h" +#include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" -#include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/sessions/tab_restore_service_factory.h" #include "chrome/browser/signin/signin_manager.h" @@ -56,14 +58,14 @@ ProfileSyncServiceFactory::ProfileSyncServiceFactory() DependsOn(PasswordStoreFactory::GetInstance()); DependsOn(ExtensionSystemFactory::GetInstance()); DependsOn(WebDataServiceFactory::GetInstance()); + DependsOn(HistoryServiceFactory::GetInstance()); + DependsOn(BookmarkModelFactory::GetInstance()); // The following have not been converted to ProfileKeyedServices yet, and for // now they are explicitly destroyed after the ProfileDependencyManager is // told to DestroyProfileServices, so they will be around when the // ProfileSyncService is destroyed. - // DependsOn(HistoryServiceFactory::GetInstance()); - // DependsOn(BookmarkBarModelFactory::GetInstance()); // DependsOn(FaviconServiceFactory::GetInstance()); } |