Removing HistoryService::profile() method

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 228 matching lines @@
           base::Bind(&LastDownloadFinder::OnDownloadQuery,
                      weak_ptr_factory_.GetWeakPtr(),
                      profile));
     } 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;
-
-  // Start the query in the history service if the finder was waiting for the
-  // service to load.
-  if (iter->second == WAITING_FOR_HISTORY) {
-    history_service->QueryDownloads(
-        base::Bind(&LastDownloadFinder::OnDownloadQuery,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   profile));
-  }
-}
-
 void LastDownloadFinder::AbandonSearchInProfile(Profile* profile) {
   // |profile| may not be present in the set of profiles.
   auto iter = profile_states_.find(profile);
   if (iter != profile_states_.end())
     RemoveProfileAndReportIfDone(iter);
 }
 
 void LastDownloadFinder::OnDownloadQuery(
     Profile* profile,
     scoped_ptr<std::vector<history::DownloadRow> > downloads) {
@@ skipping 56 matching lines @@
     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);
+  for (const auto& pair : profile_states_) {
+    HistoryService* hs = HistoryServiceFactory::GetForProfileIfExists(

[sky, 2014/12/11 19:23:49]

IMO the old way is cleaner. Why do you need to remove HS::profile() ?

+        pair.first, Profile::EXPLICIT_ACCESS);
+    if (hs == history_service) {
+      // Start the query in the history service if the finder was waiting for
+      // the service to load.
+      if (pair.second == WAITING_FOR_HISTORY) {
+        history_service->QueryDownloads(
+            base::Bind(&LastDownloadFinder::OnDownloadQuery,
+                       weak_ptr_factory_.GetWeakPtr(),
+                       pair.first));
+      }
+      return;
+    }
+  }
 }
 
 void LastDownloadFinder::HistoryServiceBeingDeleted(
     HistoryService* history_service) {
   history_service_observer_.Remove(history_service);
 }
 
 }  // namespace safe_browsing