Port HistoryService::ScheduleDBTask to CancelableTaskTracker

chrome/browser/history/in_memory_url_index_unittest.cc

 // 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.
 
 #include <algorithm>
 #include <fstream>
 
 #include "base/auto_reset.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 85 matching lines @@
   // Validates that the given |term| is contained in |cache| and that it is
   // marked as in-use.
   void CheckTerm(const URLIndexPrivateData::SearchTermCacheMap& cache,
                  base::string16 term) const;
 
   // Pass-through function to simplify our friendship with HistoryService.
   sql::Connection& GetDB();
 
   // Pass-through functions to simplify our friendship with InMemoryURLIndex.
   URLIndexPrivateData* GetPrivateData() const;
+  base::CancelableTaskTracker* GetPrivateDataTracker() const;
   void ClearPrivateData();
   void set_history_dir(const base::FilePath& dir_path);
   bool GetCacheFilePath(base::FilePath* file_path) const;
   void PostRestoreFromCacheFileTask();
   void PostSaveToCacheFileTask();
   void Observe(int notification_type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details);
   const std::set<std::string>& scheme_whitelist();
 
@@ skipping 25 matching lines @@
 
 sql::Connection& InMemoryURLIndexTest::GetDB() {
   return history_database_->GetDB();
 }
 
 URLIndexPrivateData* InMemoryURLIndexTest::GetPrivateData() const {
   DCHECK(url_index_->private_data());
   return url_index_->private_data();
 }
 
+base::CancelableTaskTracker* InMemoryURLIndexTest::GetPrivateDataTracker()
+    const {
+  DCHECK(url_index_->private_data_tracker());
+  return url_index_->private_data_tracker();
+}
+
 void InMemoryURLIndexTest::ClearPrivateData() {
   return url_index_->ClearPrivateData();
 }
 
 void InMemoryURLIndexTest::set_history_dir(const base::FilePath& dir_path) {
   return url_index_->set_history_dir(dir_path);
 }
 
 bool InMemoryURLIndexTest::GetCacheFilePath(base::FilePath* file_path) const {
   DCHECK(file_path);
@@ skipping 13 matching lines @@
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   url_index_->Observe(notification_type, source, details);
 }
 
 const std::set<std::string>& InMemoryURLIndexTest::scheme_whitelist() {
   return url_index_->scheme_whitelist();
 }
 
 bool InMemoryURLIndexTest::UpdateURL(const URLRow& row) {
-  return GetPrivateData()->UpdateURL(
-      history_service_, row, url_index_->languages_,
-      url_index_->scheme_whitelist_);
+  return GetPrivateData()->UpdateURL(history_service_,
+                                     row,
+                                     url_index_->languages_,
+                                     url_index_->scheme_whitelist_,
+                                     GetPrivateDataTracker());
 }
 
 bool InMemoryURLIndexTest::DeleteURL(const GURL& url) {
   return GetPrivateData()->DeleteURL(url);
 }
 
 void InMemoryURLIndexTest::SetUp() {
   // We cannot access the database until the backend has been loaded.
   ASSERT_TRUE(profile_.CreateHistoryService(true, false));
   profile_.CreateBookmarkModel(true);
@@ skipping 1003 matching lines @@
   full_file_path.GetComponents(&actual_parts);
   ASSERT_EQ(expected_parts.size(), actual_parts.size());
   size_t count = expected_parts.size();
   for (size_t i = 0; i < count; ++i)
     EXPECT_EQ(expected_parts[i], actual_parts[i]);
   // Must clear the history_dir_ to satisfy the dtor's DCHECK.
   set_history_dir(base::FilePath());
 }
 
 }  // namespace history