Port HistoryService::ScheduleDBTask to CancelableTaskTracker

chrome/browser/history/top_sites_impl_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 "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
@@ skipping 163 matching lines @@
   // loaded from the db.
   void RefreshTopSitesAndRecreate() {
     StartQueryForMostVisited();
     WaitForHistory();
     RecreateTopSitesAndBlock();
   }
 
   // Blocks the caller until history processes a task. This is useful if you
   // need to wait until you know history has processed a task.
   void WaitForHistory() {
-    history_service()->ScheduleDBTask(new WaitForHistoryTask(), &consumer_);
+    history_service()->ScheduleDBTask(new WaitForHistoryTask(),
+                                      &history_tracker_);
     base::MessageLoop::current()->Run();
   }
 
   // Waits for top sites to finish processing a task. This is useful if you need
   // to wait until top sites finishes processing a task.
   void WaitForTopSites() {
     top_sites()->backend_->DoEmptyRequest(
         base::Bind(&TopSitesImplTest::QuitCallback, base::Unretained(this)),
-        &cancelable_task_tracker_);
+        &top_sites_tracker_);
     base::MessageLoop::current()->Run();
   }
 
   TopSitesImpl* top_sites() {
     return static_cast<TopSitesImpl*>(profile_->GetTopSites());
   }
-  CancelableRequestConsumer* consumer() { return &consumer_; }
   TestingProfile* profile() {return profile_.get();}
   HistoryService* history_service() {
     return HistoryServiceFactory::GetForProfile(profile_.get(),
                                                 Profile::EXPLICIT_ACCESS);
   }
 
   MostVisitedURLList GetPrepopulatePages() {
     return top_sites()->GetPrepopulatePages();
   }
 
@@ skipping 114 matching lines @@
     top_sites()->thread_safe_cache_->SetTopSites(empty);
   }
 
  private:
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
   scoped_ptr<TestingProfile> profile_;
 
   // To cancel HistoryService tasks.
-  CancelableRequestConsumer consumer_;
+  base::CancelableTaskTracker history_tracker_;
 
   // To cancel TopSitesBackend tasks.
-  base::CancelableTaskTracker cancelable_task_tracker_;
+  base::CancelableTaskTracker top_sites_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(TopSitesImplTest);
 };  // Class TopSitesImplTest
 
 // Helper function for appending a URL to a vector of "most visited" URLs,
 // using the default values for everything but the URL.
 static void AppendMostVisitedURL(std::vector<MostVisitedURL>* list,
                                  const GURL& url) {
   MostVisitedURL mv;
   mv.url = url;
@@ skipping 1217 matching lines @@
   ASSERT_EQ(orig_thumbnail.getSize(), thumbnail.getSize());
   orig_thumbnail.lockPixels();
   thumbnail.lockPixels();
   EXPECT_EQ(0, memcmp(orig_thumbnail.getPixels(), thumbnail.getPixels(),
                       orig_thumbnail.getSize()));
   thumbnail.unlockPixels();
   orig_thumbnail.unlockPixels();
 }
 
 }  // namespace history