Port HistoryService::ScheduleDBTask to CancelableTaskTracker

chrome/browser/history/url_index_private_data.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_URL_INDEX_PRIVATE_DATA_H_
 #define CHROME_BROWSER_HISTORY_URL_INDEX_PRIVATE_DATA_H_
 
 #include <set>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/in_memory_url_index_cache.pb.h"
 #include "chrome/browser/history/in_memory_url_index_types.h"
 #include "chrome/browser/history/scored_history_match.h"
 
 class HistoryQuickProviderTest;
 
 namespace in_memory_url_index {
 class InMemoryURLIndexCacheItem;
 }
@@ skipping 54 matching lines @@
   // in the index then the index will be updated if the row still meets the
   // criteria, otherwise the row will be removed from the index. Returns true
   // if the index was actually updated. |languages| gives a list of language
   // encodings by which the URLs and page titles are broken down into words and
   // characters. |scheme_whitelist| is used to filter non-qualifying schemes.
   // |history_service| is used to schedule an update to the recent visits
   // component of this URL's entry in the index.
   bool UpdateURL(HistoryService* history_service,
                  const URLRow& row,
                  const std::string& languages,
-                 const std::set<std::string>& scheme_whitelist);
+                 const std::set<std::string>& scheme_whitelist,
+                 base::CancelableTaskTracker* tracker);
 
   // Updates the entry for |url_id| in the index, replacing its
   // recent visits information with |recent_visits|.  If |url_id|
   // is not in the index, does nothing.
   void UpdateRecentVisits(URLID url_id,
                           const VisitVector& recent_visits);
 
   // Using |history_service| schedules an update (using the historyDB
   // thread) for the recent visits information for |url_id|.  Unless
   // something unexpectedly goes wrong, UdpateRecentVisits() should
   // eventually be called from a callback.
   void ScheduleUpdateRecentVisits(HistoryService* history_service,
-                                  URLID url_id);
+                                  URLID url_id,
+                                  base::CancelableTaskTracker* tracker);
 
   // Deletes index data for the history item with the given |url|.
   // The item may not have actually been indexed, which is the case if it did
   // not previously meet minimum 'quick' criteria. Returns true if the index
   // was actually updated.
   bool DeleteURL(const GURL& url);
 
   // Constructs a new object by restoring its contents from the cache file
   // at |path|. Returns the new URLIndexPrivateData which on success will
   // contain the restored data but upon failure will be empty.  |languages|
@@ skipping 11 matching lines @@
   static scoped_refptr<URLIndexPrivateData> RebuildFromHistory(
       HistoryDatabase* history_db,
       const std::string& languages,
       const std::set<std::string>& scheme_whitelist);
 
   // Writes |private_data| as a cache file to |file_path| and returns success.
   static bool WritePrivateDataToCacheFileTask(
       scoped_refptr<URLIndexPrivateData> private_data,
       const base::FilePath& file_path);
 
-  // Stops all pending updates to recent visits fields.  This should be
-  // called during shutdown.
-  void CancelPendingUpdates();
-
   // Creates a copy of ourself.
   scoped_refptr<URLIndexPrivateData> Duplicate() const;
 
   // Returns true if there is no data in the index.
   bool Empty() const;
 
   // Initializes all index data members in preparation for restoring the index
   // from the cache or a complete rebuild from the history database.
   void Clear();
 
@@ skipping 106 matching lines @@
   // |history_db| is not NULL then this function uses the history database
   // synchronously to get the URL's recent visits information.  This mode should
   // only be used on the historyDB thread.  If |history_db| is NULL, then
   // this function uses |history_service| to schedule a task on the
   // historyDB thread to fetch and update the recent visits
   // information.
   bool IndexRow(HistoryDatabase* history_db,
                 HistoryService* history_service,
                 const URLRow& row,
                 const std::string& languages,
-                const std::set<std::string>& scheme_whitelist);
+                const std::set<std::string>& scheme_whitelist,
+                base::CancelableTaskTracker* tracker);
 
   // Parses and indexes the words in the URL and page title of |row| and
   // calculate the word starts in each, saving the starts in |word_starts|.
   // |languages| gives a list of language encodings by which the URLs and page
   // titles are broken down into words and characters.
   void AddRowWordsToIndex(const URLRow& row,
                           RowWordStarts* word_starts,
                           const std::string& languages);
 
   // Given a single word in |uni_word|, adds a reference for the containing
@@ skipping 47 matching lines @@
   bool RestoreWordStartsMap(const imui::InMemoryURLIndexCacheItem& cache,
                             const std::string& languages);
 
   // Determines if |gurl| has a whitelisted scheme and returns true if so.
   static bool URLSchemeIsWhitelisted(const GURL& gurl,
                                      const std::set<std::string>& whitelist);
 
   // Cache of search terms.
   SearchTermCacheMap search_term_cache_;
 
-  // Allows canceling pending requests to update recent visits information.
-  CancelableRequestConsumer recent_visits_consumer_;
-
   // Start of data members that are cached -------------------------------------
 
   // The version of the cache file most recently used to restore this instance
   // of the private data. If the private data was rebuilt from the history
   // database this will be 0.
   int restored_cache_version_;
 
   // The last time the data was rebuilt from the history database.
   base::Time last_time_rebuilt_from_history_;
 
@@ skipping 47 matching lines @@
   // Used for unit testing only. Records the number of candidate history items
   // at three stages in the index searching process.
   size_t pre_filter_item_count_;    // After word index is queried.
   size_t post_filter_item_count_;   // After trimming large result set.
   size_t post_scoring_item_count_;  // After performing final filter/scoring.
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_URL_INDEX_PRIVATE_DATA_H_