base::Bind: Implement CancelableCallback to replace CancelableTaske.

webkit/appcache/appcache_group.h

 // Copyright (c) 2011 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.
 
 #ifndef WEBKIT_APPCACHE_APPCACHE_GROUP_H_
 #define WEBKIT_APPCACHE_APPCACHE_GROUP_H_
 
 #include <map>
 #include <vector>
 
+#include "base/cancelable_callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/appcache/appcache_export.h"
 
 namespace appcache {
@@ skipping 118 matching lines @@
 
   // Central service object.
   AppCacheService* service_;
 
   // List of objects observing this group.
   ObserverList<UpdateObserver> observers_;
 
   // Updates that have been queued for the next run.
   QueuedUpdates queued_updates_;
   ObserverList<UpdateObserver> queued_observers_;
-  CancelableTask* restart_update_task_;
+  base::CancelableCallback restart_update_task_;
   scoped_ptr<HostObserver> host_observer_;
 
   // True if we're in our destructor.
   bool is_in_dtor_;
 
   FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, StartUpdate);
   FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, CancelUpdate);
   FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, QueueUpdate);
   FRIEND_TEST_ALL_PREFIXES(AppCacheUpdateJobTest, AlreadyChecking);
   FRIEND_TEST_ALL_PREFIXES(AppCacheUpdateJobTest, AlreadyDownloading);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheGroup);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_GROUP_H_