base::Bind: Implement CancelableCallback to replace CancelableTaske.

webkit/appcache/appcache_group_unittest.cc

Index: webkit/appcache/appcache_group_unittest.cc
diff --git a/webkit/appcache/appcache_group_unittest.cc b/webkit/appcache/appcache_group_unittest.cc
index 26eb5ca25869c9b23cb11168587aee25654be6a6..71df59928e0e309b00814fe861013faf8b79cfca 100644
--- a/webkit/appcache/appcache_group_unittest.cc
+++ b/webkit/appcache/appcache_group_unittest.cc
@@ -275,14 +275,14 @@ TEST(AppCacheGroupTest, QueueUpdate) {
   // sent to host.
   delete group->update_job_;
   EXPECT_EQ(AppCacheGroup::IDLE, group->update_status_);
-  EXPECT_TRUE(group->restart_update_task_);
+  EXPECT_FALSE(group->restart_update_task_.IsCancelled());
   EXPECT_FALSE(host.update_completed_);
 
   // Start another update. Cancels task and will run queued updates.
   group->update_status_ = AppCacheGroup::CHECKING;  // prevent actual fetches
   group->StartUpdate();
   EXPECT_TRUE(group->update_job_);
-  EXPECT_FALSE(group->restart_update_task_);
+  EXPECT_TRUE(group->restart_update_task_.IsCancelled());
   EXPECT_TRUE(group->queued_updates_.empty());
   EXPECT_FALSE(group->update_job_->pending_master_entries_.empty());
   EXPECT_FALSE(group->FindObserver(&host, group->queued_observers_));
@@ -291,7 +291,7 @@ TEST(AppCacheGroupTest, QueueUpdate) {
   // Delete update to cause it to complete. Verify host is notified.
   delete group->update_job_;
   EXPECT_EQ(AppCacheGroup::IDLE, group->update_status_);
-  EXPECT_FALSE(group->restart_update_task_);
+  EXPECT_TRUE(group->restart_update_task_.IsCancelled());
   EXPECT_TRUE(host.update_completed_);
 }