Eliminate NOTIFICATION_HISTORY_LOADED notification

chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc

 // Copyright 2014 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/safe_browsing/incident_reporting/last_download_finder.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 141 matching lines @@
   scoped_ptr<LastDownloadFinder> finder(make_scoped_ptr(new LastDownloadFinder(
       download_details_getter,
       g_browser_process->profile_manager()->GetLoadedProfiles(),
       callback)));
   // Return NULL if there is no work to do.
   if (finder->profile_states_.empty())
     return scoped_ptr<LastDownloadFinder>();
   return finder.Pass();
 }
 
-LastDownloadFinder::LastDownloadFinder() : weak_ptr_factory_(this) {
+LastDownloadFinder::LastDownloadFinder()
+    : history_service_observer_(this), weak_ptr_factory_(this) {
 }
 
 LastDownloadFinder::LastDownloadFinder(
     const DownloadDetailsGetter& download_details_getter,
     const std::vector<Profile*>& profiles,
     const LastDownloadCallback& callback)
     : download_details_getter_(download_details_getter),
       callback_(callback),
+      history_service_observer_(this),
       weak_ptr_factory_(this) {
   // Observe profile lifecycle events so that the finder can begin or abandon
   // the search in profiles while it is running.
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_PROFILE_ADDED,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
-                              chrome::NOTIFICATION_HISTORY_LOADED,
-                              content::NotificationService::AllSources());
-  notification_registrar_.Add(this,
                               chrome::NOTIFICATION_PROFILE_DESTROYED,
                               content::NotificationService::AllSources());
 
   // Begin the seach for all given profiles.
   std::for_each(
       profiles.begin(),
       profiles.end(),
       std::bind1st(std::mem_fun(&LastDownloadFinder::SearchInProfile), this));
 }
 
 void LastDownloadFinder::SearchInProfile(Profile* profile) {
   // Do not look in OTR profiles or in profiles that do not participate in
   // safe browsing.
   if (profile->IsOffTheRecord() ||
       !profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled)) {
     return;
   }
 
   // Exit early if already processing this profile. This could happen if, for
   // example, NOTIFICATION_PROFILE_ADDED arrives after construction while
-  // waiting for NOTIFICATION_HISTORY_LOADED.
+  // waiting for OnHistoryServiceLoaded.
   if (profile_states_.count(profile))
     return;
 
   // Initiate a metadata search.
   profile_states_[profile] = WAITING_FOR_METADATA;
   download_details_getter_.Run(profile,
                                base::Bind(&LastDownloadFinder::OnMetadataQuery,
                                           weak_ptr_factory_.GetWeakPtr(),
                                           profile));
 }
@@ skipping 21 matching lines @@
     // No history service is returned for profiles that do not save history.
     if (!history_service) {
       RemoveProfileAndReportIfDone(iter);
       return;
     }
     if (history_service->BackendLoaded()) {
       history_service->QueryDownloads(
           base::Bind(&LastDownloadFinder::OnDownloadQuery,
                      weak_ptr_factory_.GetWeakPtr(),
                      profile));
-    }  // else wait until history is loaded.
+    } else {
+      // else wait until history is loaded.
+      history_service_observer_.Add(history_service);
+    }
   }
 }
 
 void LastDownloadFinder::OnProfileHistoryLoaded(
     Profile* profile,
     HistoryService* history_service) {
   auto iter = profile_states_.find(profile);
   if (iter == profile_states_.end())
     return;
 
@@ skipping 66 matching lines @@
   }
 }
 
 void LastDownloadFinder::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_PROFILE_ADDED:
       SearchInProfile(content::Source<Profile>(source).ptr());
       break;
-    case chrome::NOTIFICATION_HISTORY_LOADED:
-      OnProfileHistoryLoaded(content::Source<Profile>(source).ptr(),
-                             content::Details<HistoryService>(details).ptr());
-      break;
     case chrome::NOTIFICATION_PROFILE_DESTROYED:
       AbandonSearchInProfile(content::Source<Profile>(source).ptr());
       break;
     default:
       break;
   }
 }
 
+void LastDownloadFinder::OnHistoryServiceLoaded(
+    HistoryService* history_service) {
+  OnProfileHistoryLoaded(history_service->profile(), history_service);
+}
+
+void LastDownloadFinder::HistoryServiceBeingDeleted(
+    HistoryService* history_service) {
+  history_service_observer_.Remove(history_service);
+}
+
 }  // namespace safe_browsing