Remove use of base::Callback<> in HistoryService

Uses of base::Callback<...> is deprecated in favor of either
base::OnceCallback<...> or base::RepeatingCallback<...> (the
former is preferred if possible).

This is part 1 of a multi-CL refactoring and does:

-   convert GetCountsAndLastVisitForOriginsCallback to be a
    base::OnceCallback<...>

-   pass the callback parameter by value instead of as a
    const reference

Bug: 812523, 714018
Change-Id: I932b424b026611c8b1adfdb3fb244d0afd0ec1cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1630484
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663787}

components/history/core/browser/history_service.cc

@@ -334,14 +334,14 @@ void HistoryService::SetOnBackendDestroyTask(const base::Closure& task) {
 
 void HistoryService::GetCountsAndLastVisitForOriginsForTesting(
     const std::set<GURL>& origins,
-    const GetCountsAndLastVisitForOriginsCallback& callback) const {
+    GetCountsAndLastVisitForOriginsCallback callback) const {
   DCHECK(backend_task_runner_) << "History service being called after cleanup";
   DCHECK(thread_checker_.CalledOnValidThread());
   PostTaskAndReplyWithResult(
       backend_task_runner_.get(), FROM_HERE,
-      base::Bind(&HistoryBackend::GetCountsAndLastVisitForOrigins,
-                 history_backend_, origins),
-      callback);
+      base::BindOnce(&HistoryBackend::GetCountsAndLastVisitForOrigins,
+                     history_backend_, origins),
+      std::move(callback));
 }
 
 void HistoryService::AddPage(const GURL& url,

components/history/core/browser/history_service.h

@@ -138,14 +138,14 @@ class HistoryService : public KeyedService {
 
   // Callback for value asynchronously returned by
   // GetCountsAndLastVisitForOrigins().
-  typedef base::Callback<void(const OriginCountAndLastVisitMap&)>
-      GetCountsAndLastVisitForOriginsCallback;
+  using GetCountsAndLastVisitForOriginsCallback =
+      base::OnceCallback<void(OriginCountAndLastVisitMap)>;
 
   // Gets the counts and most recent visit date of URLs that belong to |origins|
   // in the history database.
   void GetCountsAndLastVisitForOriginsForTesting(
       const std::set<GURL>& origins,
-      const GetCountsAndLastVisitForOriginsCallback& callback) const;
+      GetCountsAndLastVisitForOriginsCallback callback) const;
 
   // Navigation ----------------------------------------------------------------
 

ios/chrome/test/app/sync_test_util.mm

@@ -297,9 +297,8 @@ BOOL IsTypedUrlPresentOnClient(const GURL& url,
 
   __block bool history_service_callback_called = false;
   __block int count = 0;
-  using history::OriginCountAndLastVisitMap;
   history_service->GetCountsAndLastVisitForOriginsForTesting(
-      origins, base::BindRepeating(^(const OriginCountAndLastVisitMap& result) {
+      origins, base::BindOnce(^(history::OriginCountAndLastVisitMap result) {
         auto iter = result.find(block_safe_url);
         if (iter != result.end())
           count = iter->second.first;