Merge 152146 - DownloadHistory::Load use HistoryServiceFactory::GetForProfile not IfExists

chrome/browser/download/download_history.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/download/download_history.h"
 
 #include "base/logging.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/history/history_marshaling.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_persistent_store_info.h"
 
 using content::DownloadItem;
 using content::DownloadPersistentStoreInfo;
 
 DownloadHistory::DownloadHistory(Profile* profile)
     : profile_(profile),
       next_fake_db_handle_(DownloadItem::kUninitializedHandle - 1) {
   DCHECK(profile);
 }
 
 DownloadHistory::~DownloadHistory() {}
 
 void DownloadHistory::GetNextId(
     const HistoryService::DownloadNextIdCallback& callback) {
-  HistoryService* hs = HistoryServiceFactory::GetForProfileIfExists(
+  HistoryService* hs = HistoryServiceFactory::GetForProfile(
       profile_, Profile::EXPLICIT_ACCESS);
   if (!hs)
     return;
 
   hs->GetNextDownloadId(&history_consumer_, callback);
 }
 
 void DownloadHistory::Load(
     const HistoryService::DownloadQueryCallback& callback) {
-  HistoryService* hs = HistoryServiceFactory::GetForProfileIfExists(
+  HistoryService* hs = HistoryServiceFactory::GetForProfile(
       profile_, Profile::EXPLICIT_ACCESS);
   if (!hs)
     return;
 
   hs->QueryDownloads(&history_consumer_, callback);
 
   // This is the initial load, so do a cleanup of corrupt in-progress entries.
   hs->CleanUpInProgressEntries();
 }
 
@@ skipping 97 matching lines @@
                                             int count,
                                             base::Time first_visit) {
   VisitedBeforeRequestsMap::iterator request =
       visited_before_requests_.find(handle);
   DCHECK(request != visited_before_requests_.end());
   VisitedBeforeDoneCallback callback = request->second;
   visited_before_requests_.erase(request);
   callback.Run(found_visits && count &&
       (first_visit.LocalMidnight() < base::Time::Now().LocalMidnight()));
 }