base::Bind: Implement CancelableCallback to replace CancelableTaske.

webkit/appcache/appcache_group_unittest.cc

 // Copyright (c) 2010 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 <string>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/appcache/appcache.h"
 #include "webkit/appcache/appcache_group.h"
 #include "webkit/appcache/appcache_host.h"
@@ skipping 257 matching lines @@
   EXPECT_FALSE(group->queued_updates_.empty());
 
   group->AddUpdateObserver(&host);
   EXPECT_FALSE(group->FindObserver(&host, group->observers_));
   EXPECT_TRUE(group->FindObserver(&host, group->queued_observers_));
 
   // Delete update to cause it to complete. Verify no update complete notice
   // 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_));
   EXPECT_TRUE(group->FindObserver(&host, group->observers_));
 
   // 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_);
 }
 
 }  // namespace appcache