Add comment explaining fix and added explicit HistoryService dependency in predictor.

R=scottbyer@chromium.org,shishir@chromium.org
BUG=140466


Review URL: https://chromiumcodereview.appspot.com/10825188

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150120 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/predictors/predictor_database.cc

@@ -70,7 +70,6 @@ PredictorDatabaseInternal::~PredictorDatabaseInternal() {
 
 void PredictorDatabaseInternal::Initialize() {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::DB));
-
   db_.set_exclusive_locking();
   bool success = db_.Open(db_path_);
 

chrome/browser/predictors/resource_prefetch_predictor_factory.cc

@@ -4,6 +4,7 @@
 
 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h"
 
+#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/predictors/predictor_database_factory.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor.h"
 #include "chrome/browser/profiles/profile.h"
@@ -27,8 +28,7 @@ ResourcePrefetchPredictorFactory::GetInstance() {
 ResourcePrefetchPredictorFactory::ResourcePrefetchPredictorFactory()
     : ProfileKeyedServiceFactory("ResourcePrefetchPredictor",
                                  ProfileDependencyManager::GetInstance()) {
-  // TODO(shishir): Uncomment this when crbug.com/97804 is fixed.
-  // DependsOn(HistoryServiceFactory::GetInstance());
+  DependsOn(HistoryServiceFactory::GetInstance());
   DependsOn(PredictorDatabaseFactory::GetInstance());
 }
 

chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc

@@ -58,6 +58,10 @@ IN_PROC_BROWSER_TEST_F(CloudPrintPolicyTest, NormalPassedFlag) {
 IN_PROC_BROWSER_TEST_F(CloudPrintPolicyTest, CloudPrintPolicyFlag) {
   CommandLine new_command_line(GetCommandLineForRelaunch());
   new_command_line.AppendSwitch(switches::kCheckCloudPrintConnectorPolicy);
+  // This is important for the test as the way the browser process is launched
+  // here causes the predictor databases to be initialized multiple times. This
+  // is not an issue for production where the process is launched as a service
+  // and a Profile is not created. See http://crbug.com/140466 for more details.
   new_command_line.AppendSwitchASCII(
       switches::kSpeculativeResourcePrefetching,
       switches::kSpeculativeResourcePrefetchingDisabled);