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

5 files changed, 13 insertions, 11 deletions

diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc
index 536eb70..4e05fbc 100644
--- a/chrome/browser/bookmarks/bookmark_model_factory.cc
+++ b/chrome/browser/bookmarks/bookmark_model_factory.cc
@@ -27,7 +27,7 @@ BookmarkModelFactory* BookmarkModelFactory::GetInstance() {
 }
 
 BookmarkModelFactory::BookmarkModelFactory()
-    : ProfileKeyedServiceFactory("BookmarkModelFactory",
+    : ProfileKeyedServiceFactory("BookmarkModel",
                                  ProfileDependencyManager::GetInstance()) {
 }
 
diff --git a/chrome/browser/download/download_service_factory.cc b/chrome/browser/download/download_service_factory.cc
index c011fca..3150dee 100644
--- a/chrome/browser/download/download_service_factory.cc
+++ b/chrome/browser/download/download_service_factory.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/download/download_service_factory.h"
 
 #include "chrome/browser/download/download_service.h"
+#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 
 // static
@@ -22,8 +23,7 @@ DownloadServiceFactory* DownloadServiceFactory::GetInstance() {
 DownloadServiceFactory::DownloadServiceFactory()
     : ProfileKeyedServiceFactory("DownloadService",
                                  ProfileDependencyManager::GetInstance()) {
-  // TODO(rdsmith): For Shutdown() order we need to:
-  //    DependsOn(HistoryServiceDataFactory::GetInstance());
+  DependsOn(HistoryServiceFactory::GetInstance());
 }
 
 DownloadServiceFactory::~DownloadServiceFactory() {
diff --git a/chrome/browser/predictors/autocomplete_action_predictor_factory.cc b/chrome/browser/predictors/autocomplete_action_predictor_factory.cc
index b1ff1c2..91be6f2 100644
--- a/chrome/browser/predictors/autocomplete_action_predictor_factory.cc
+++ b/chrome/browser/predictors/autocomplete_action_predictor_factory.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
 
+#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor.h"
 #include "chrome/browser/predictors/predictor_database_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ -27,8 +28,7 @@ AutocompleteActionPredictorFactory*
 AutocompleteActionPredictorFactory::AutocompleteActionPredictorFactory()
     : ProfileKeyedServiceFactory("AutocompleteActionPredictor",
                                  ProfileDependencyManager::GetInstance()) {
-  // TODO(erg): When HistoryService is PKSFized, uncomment this.
-  //  DependsOn(HistoryServiceFactory::GetInstance());
+  DependsOn(HistoryServiceFactory::GetInstance());
   DependsOn(PredictorDatabaseFactory::GetInstance());
 }
 
diff --git a/chrome/browser/search_engines/template_url_service_factory.cc b/chrome/browser/search_engines/template_url_service_factory.cc
index 42ad3e4..7d7d0b5 100644
--- a/chrome/browser/search_engines/template_url_service_factory.cc
+++ b/chrome/browser/search_engines/template_url_service_factory.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 
 #include "chrome/browser/google/google_url_tracker_factory.h"
+#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ -32,9 +33,8 @@ TemplateURLServiceFactory::TemplateURLServiceFactory()
     : ProfileKeyedServiceFactory("TemplateURLServiceFactory",
                                  ProfileDependencyManager::GetInstance()) {
   DependsOn(GoogleURLTrackerFactory::GetInstance());
+  DependsOn(HistoryServiceFactory::GetInstance());
   DependsOn(WebDataServiceFactory::GetInstance());
-  // TODO(erg): For Shutdown() order, we need to:
-  //     DependsOn(HistoryServiceFactory::GetInstance());
 }
 
 TemplateURLServiceFactory::~TemplateURLServiceFactory() {}
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());
 }