Fixing some more instances where I put in HistoryServiceFactory::GetForProfile...

Fixing some more instances where I put in HistoryServiceFactory::GetForProfile which will force creation of the history. Replacing those instantces where we should not force creation and should instead just check if the history has already been created.

BUG=97804
TEST=unittests

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

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

chrome/browser/bookmarks/bookmark_model_unittest.cc

@@ -1069,7 +1069,8 @@ TEST_F(BookmarkModelTestWithProfile2, RemoveNotification) {
 
   // This won't actually delete the URL, rather it'll empty out the visits.
   // This triggers blocking on the BookmarkModel.
-  profile_->GetHistoryService(Profile::EXPLICIT_ACCESS)->DeleteURL(url);
+  HistoryServiceFactory::GetForProfile(
+      profile_.get(), Profile::EXPLICIT_ACCESS)->DeleteURL(url);
 }
 
 TEST_F(BookmarkModelTest, Sort) {

chrome/browser/download/download_history.cc

@@ -25,8 +25,8 @@ DownloadHistory::~DownloadHistory() {}
 
 void DownloadHistory::GetNextId(
     const HistoryService::DownloadNextIdCallback& callback) {
-  HistoryService* hs =
-      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+  HistoryService* hs = HistoryServiceFactory::GetForProfileIfExists(
+      profile_, Profile::EXPLICIT_ACCESS);
   if (!hs)
     return;
 
@@ -35,8 +35,8 @@ void DownloadHistory::GetNextId(
 
 void DownloadHistory::Load(
     const HistoryService::DownloadQueryCallback& callback) {
-  HistoryService* hs =
-      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+  HistoryService* hs = HistoryServiceFactory::GetForProfileIfExists(
+      profile_, Profile::EXPLICIT_ACCESS);
   if (!hs)
     return;
 
@@ -51,9 +51,8 @@ void DownloadHistory::CheckVisitedReferrerBefore(
     const GURL& referrer_url,
     const VisitedBeforeDoneCallback& callback) {
   if (referrer_url.is_valid()) {
-    HistoryService* hs =
-        HistoryServiceFactory::GetForProfile(profile_,
-                                             Profile::EXPLICIT_ACCESS);
+    HistoryService* hs = HistoryServiceFactory::GetForProfileIfExists(
+        profile_, Profile::EXPLICIT_ACCESS);
     if (hs) {
       HistoryService::Handle handle =
           hs->GetVisibleVisitCountToHost(referrer_url, &history_consumer_,
@@ -79,8 +78,8 @@ void DownloadHistory::AddEntry(
   // handles, so we use a negative value. Eventually, they could overlap, but
   // you'd have to do enough downloading that your ISP would likely stab you in
   // the neck first. YMMV.
-  HistoryService* hs =
-      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+  HistoryService* hs = HistoryServiceFactory::GetForProfileIfExists(
+      profile_, Profile::EXPLICIT_ACCESS);
   if (download_item->IsOtr() ||
       download_crx_util::IsExtensionDownload(*download_item) ||
       download_item->IsTemporary() || !hs) {
@@ -100,8 +99,8 @@ void DownloadHistory::UpdateEntry(DownloadItem* download_item) {
   if (download_item->GetDbHandle() <= DownloadItem::kUninitializedHandle)
     return;
 
-  HistoryService* hs =
-      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+  HistoryService* hs = HistoryServiceFactory::GetForProfileIfExists(
+      profile_, Profile::EXPLICIT_ACCESS);
   if (!hs)
     return;
   hs->UpdateDownload(download_item->GetPersistentStoreInfo());
@@ -113,8 +112,8 @@ void DownloadHistory::UpdateDownloadPath(DownloadItem* download_item,
   if (download_item->GetDbHandle() <= DownloadItem::kUninitializedHandle)
     return;
 
-  HistoryService* hs =
-      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+  HistoryService* hs = HistoryServiceFactory::GetForProfileIfExists(
+      profile_, Profile::EXPLICIT_ACCESS);
   if (hs)
     hs->UpdateDownloadPath(new_path, download_item->GetDbHandle());
 }
@@ -124,16 +123,16 @@ void DownloadHistory::RemoveEntry(DownloadItem* download_item) {
   if (download_item->GetDbHandle() <= DownloadItem::kUninitializedHandle)
     return;
 
-  HistoryService* hs =
-      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+  HistoryService* hs = HistoryServiceFactory::GetForProfileIfExists(
+      profile_, Profile::EXPLICIT_ACCESS);
   if (hs)
     hs->RemoveDownload(download_item->GetDbHandle());
 }
 
 void DownloadHistory::RemoveEntriesBetween(const base::Time remove_begin,
                                            const base::Time remove_end) {
-  HistoryService* hs =
-      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+  HistoryService* hs = HistoryServiceFactory::GetForProfileIfExists(
+      profile_, Profile::EXPLICIT_ACCESS);
   if (hs)
     hs->RemoveDownloadsBetween(remove_begin, remove_end);
 }