Add HistoryService::FaviconChangedCallback type alias.

This makes it easier to track down and/or change types.

Also renames CallbackList -> RepeatingCallbackList.

Bug: 1113007
Change-Id: I42357489f2c3e7a19b0f4909fe20ca7dc9ff4339
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354225Reviewed-by: Sergio Collazos <sczs@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Maksim Moskvitin <mmoskvitin@google.com>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797771}

chrome/browser/history/chrome_history_client.h

@@ -13,6 +13,7 @@
 #include "base/macros.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/history/core/browser/history_client.h"
+#include "components/history/core/browser/history_service.h"
 
 class GURL;
 
@@ -60,8 +61,8 @@ class ChromeHistoryClient : public history::HistoryClient,
   base::Callback<void(const std::set<GURL>&)> on_bookmarks_removed_;
 
   // Subscription for notifications of changes to favicons.
-  std::unique_ptr<base::CallbackList<void(const std::set<GURL>&,
-                                          const GURL&)>::Subscription>
+  std::unique_ptr<
+      history::HistoryService::FaviconsChangedCallbackList::Subscription>
       favicons_changed_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeHistoryClient);

chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc

@@ -236,8 +236,8 @@ class FaviconForPageUrlAvailableChecker : public StatusChangeChecker {
   Profile* const profile_;
   const GURL page_url_;
   const bool should_be_available_;
-  std::unique_ptr<base::CallbackList<void(const std::set<GURL>&,
-                                          const GURL&)>::Subscription>
+  std::unique_ptr<
+      history::HistoryService::FaviconsChangedCallbackList::Subscription>
       callback_subscription_;
   bool exit_condition_satisfied_ = false;
   base::CancelableTaskTracker tracker_;

components/history/core/browser/history_service.cc

@@ -1241,18 +1241,17 @@ void HistoryService::NotifyKeywordSearchTermDeleted(URLID url_id) {
     observer.OnKeywordSearchTermDeleted(this, url_id);
 }
 
-std::unique_ptr<
-    base::CallbackList<void(const std::set<GURL>&, const GURL&)>::Subscription>
+std::unique_ptr<HistoryService::FaviconsChangedCallbackList::Subscription>
 HistoryService::AddFaviconsChangedCallback(
-    const HistoryService::OnFaviconsChangedCallback& callback) {
+    const HistoryService::FaviconsChangedCallback& callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  return favicon_changed_callback_list_.Add(callback);
+  return favicons_changed_callback_list_.Add(callback);
 }
 
 void HistoryService::NotifyFaviconsChanged(const std::set<GURL>& page_urls,
                                            const GURL& icon_url) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  favicon_changed_callback_list_.Notify(page_urls, icon_url);
+  favicons_changed_callback_list_.Notify(page_urls, icon_url);
 }
 
 }  // namespace history

components/history/core/browser/history_service.h

@@ -479,15 +479,15 @@ class HistoryService : public KeyedService {
   // icon URL (e.g. http://www.google.com/favicon.ico) for which the favicon
   // data has changed. It is valid to call the callback with non-empty
   // "page URLs" and no "icon URL" and vice versa.
-  using OnFaviconsChangedCallback =
-      base::RepeatingCallback<void(const std::set<GURL>&, const GURL&)>;
+  using FaviconsChangedCallbackList =
+      base::RepeatingCallbackList<void(const std::set<GURL>&, const GURL&)>;
+  using FaviconsChangedCallback = FaviconsChangedCallbackList::CallbackType;
 
   // Add a callback to the list. The callback will remain registered until the
   // returned Subscription is destroyed. The Subscription must be destroyed
   // before HistoryService is destroyed.
-  std::unique_ptr<base::CallbackList<void(const std::set<GURL>&,
-                                          const GURL&)>::Subscription>
-  AddFaviconsChangedCallback(const OnFaviconsChangedCallback& callback)
+  std::unique_ptr<FaviconsChangedCallbackList::Subscription>
+  AddFaviconsChangedCallback(const FaviconsChangedCallback& callback)
       WARN_UNUSED_RESULT;
 
   // Testing -------------------------------------------------------------------
@@ -874,8 +874,7 @@ class HistoryService : public KeyedService {
   bool backend_loaded_;
 
   base::ObserverList<HistoryServiceObserver>::Unchecked observers_;
-  base::CallbackList<void(const std::set<GURL>&, const GURL&)>
-      favicon_changed_callback_list_;
+  FaviconsChangedCallbackList favicons_changed_callback_list_;
 
   std::unique_ptr<DeleteDirectiveHandler> delete_directive_handler_;
 

components/omnibox/browser/favicon_cache.h

@@ -146,8 +146,8 @@ class FaviconCache : public history::HistoryServiceObserver {
   base::MRUCache<Request, bool> responses_without_favicons_;
 
   // Subscription for notifications of changes to favicons.
-  std::unique_ptr<base::CallbackList<void(const std::set<GURL>&,
-                                          const GURL&)>::Subscription>
+  std::unique_ptr<
+      history::HistoryService::FaviconsChangedCallbackList::Subscription>
       favicons_changed_subscription_;
 
   base::WeakPtrFactory<FaviconCache> weak_factory_{this};

ios/chrome/browser/history/history_client_impl.h

@@ -13,6 +13,7 @@
 #include "base/macros.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/history/core/browser/history_client.h"
+#include "components/history/core/browser/history_service.h"
 
 class GURL;
 
@@ -58,8 +59,8 @@ class HistoryClientImpl : public history::HistoryClient,
   base::Callback<void(const std::set<GURL>&)> on_bookmarks_removed_;
 
   // Subscription for notifications of changes to favicons.
-  std::unique_ptr<base::CallbackList<void(const std::set<GURL>&,
-                                          const GURL&)>::Subscription>
+  std::unique_ptr<
+      history::HistoryService::FaviconsChangedCallbackList::Subscription>
       favicons_changed_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryClientImpl);