Port History::QueryMostVisitedURLs to use CancelableTaskTracker

chrome/browser/history/history_unittest.cc

Index: chrome/browser/history/history_unittest.cc
diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
index 600939c9b8e9fc242cd9cbce37be49215e6ca86f..19a9069841c433393baedd188d33b6c498d36102 100644
--- a/chrome/browser/history/history_unittest.cc
+++ b/chrome/browser/history/history_unittest.cc
@@ -994,9 +994,8 @@ class HistoryTest : public testing::Test {
     base::MessageLoop::current()->Quit();
   }
 
-  void OnMostVisitedURLsAvailable(CancelableRequestProvider::Handle handle,
-                                  MostVisitedURLList url_list) {
-    most_visited_urls_.swap(url_list);
+  void OnMostVisitedURLsAvailable(const MostVisitedURLList* url_list) {
+    most_visited_urls_ = *url_list;
     base::MessageLoop::current()->Quit();
   }
 
@@ -1484,10 +1483,11 @@ TEST_F(HistoryTest, MostVisitedURLs) {
       history::RedirectList(), content::PAGE_TRANSITION_TYPED,
       history::SOURCE_BROWSED, false);
   history_service_->QueryMostVisitedURLs(
-      20, 90, &consumer_,
+      20, 90,
       base::Bind(
           &HistoryTest::OnMostVisitedURLsAvailable,
-          base::Unretained(this)));
+          base::Unretained(this)),
+      &tracker_);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(2U, most_visited_urls_.size());
@@ -1500,10 +1500,11 @@ TEST_F(HistoryTest, MostVisitedURLs) {
       history::RedirectList(), content::PAGE_TRANSITION_TYPED,
       history::SOURCE_BROWSED, false);
   history_service_->QueryMostVisitedURLs(
-      20, 90, &consumer_,
+      20, 90,
       base::Bind(
           &HistoryTest::OnMostVisitedURLsAvailable,
-          base::Unretained(this)));
+          base::Unretained(this)),
+      &tracker_);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(3U, most_visited_urls_.size());
@@ -1517,10 +1518,11 @@ TEST_F(HistoryTest, MostVisitedURLs) {
       history::RedirectList(), content::PAGE_TRANSITION_TYPED,
       history::SOURCE_BROWSED, false);
   history_service_->QueryMostVisitedURLs(
-      20, 90, &consumer_,
+      20, 90,
       base::Bind(
           &HistoryTest::OnMostVisitedURLsAvailable,
-          base::Unretained(this)));
+          base::Unretained(this)),
+      &tracker_);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(3U, most_visited_urls_.size());
@@ -1534,10 +1536,11 @@ TEST_F(HistoryTest, MostVisitedURLs) {
       history::RedirectList(), content::PAGE_TRANSITION_TYPED,
       history::SOURCE_BROWSED, false);
   history_service_->QueryMostVisitedURLs(
-      20, 90, &consumer_,
+      20, 90,
       base::Bind(
           &HistoryTest::OnMostVisitedURLsAvailable,
-          base::Unretained(this)));
+          base::Unretained(this)),
+      &tracker_);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(3U, most_visited_urls_.size());
@@ -1556,10 +1559,11 @@ TEST_F(HistoryTest, MostVisitedURLs) {
       redirects, content::PAGE_TRANSITION_TYPED,
       history::SOURCE_BROWSED, false);
   history_service_->QueryMostVisitedURLs(
-      20, 90, &consumer_,
+      20, 90,
       base::Bind(
           &HistoryTest::OnMostVisitedURLsAvailable,
-          base::Unretained(this)));
+          base::Unretained(this)),
+      &tracker_);
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(4U, most_visited_urls_.size());