base::Bind: Convert most of webkit/appcache.

webkit/appcache/mock_appcache_storage.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_MOCK_APPCACHE_STORAGE_H_
 #define WEBKIT_APPCACHE_MOCK_APPCACHE_STORAGE_H_
 
 #include <deque>
 #include <map>
 #include <vector>
 
+#include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/task.h"
+#include "base/memory/weak_ptr.h"
 #include "webkit/appcache/appcache.h"
 #include "webkit/appcache/appcache_disk_cache.h"
 #include "webkit/appcache/appcache_group.h"
 #include "webkit/appcache/appcache_response.h"
 #include "webkit/appcache/appcache_storage.h"
 
 namespace appcache {
 
 // For use in unit tests.
 // Note: This class is also being used to bootstrap our development efforts.
@@ skipping 43 matching lines @@
       const GURL& manifest_url, scoped_refptr<DelegateReference> delegate_ref);
   void ProcessStoreGroupAndNewestCache(
       scoped_refptr<AppCacheGroup> group, scoped_refptr<AppCache> newest_cache,
       scoped_refptr<DelegateReference> delegate_ref);
   void ProcessMakeGroupObsolete(
       scoped_refptr<AppCacheGroup> group,
       scoped_refptr<DelegateReference> delegate_ref);
   void ProcessFindResponseForMainRequest(
       const GURL& url, scoped_refptr<DelegateReference> delegate_ref);
 
-  void ScheduleTask(Task* task);
+  void ScheduleTask(const base::Closure& task);
   void RunOnePendingTask();
 
   void AddStoredCache(AppCache* cache);
   void RemoveStoredCache(AppCache* cache);
   void RemoveStoredCaches(const AppCacheGroup::Caches& caches);
   bool IsCacheStored(const AppCache* cache) {
     return stored_caches_.find(cache->cache_id()) != stored_caches_.end();
   }
 
   void AddStoredGroup(AppCacheGroup* group);
@@ skipping 71 matching lines @@
   }
 
   void SimulateResponseReader(AppCacheResponseReader* reader) {
     simulated_reader_.reset(reader);
   }
 
   StoredCacheMap stored_caches_;
   StoredGroupMap stored_groups_;
   DoomedResponseIds doomed_response_ids_;
   scoped_ptr<AppCacheDiskCache> disk_cache_;
-  std::deque<Task*> pending_tasks_;
-  ScopedRunnableMethodFactory<MockAppCacheStorage> method_factory_;
+  std::deque<base::Closure> pending_tasks_;
+  base::WeakPtrFactory<MockAppCacheStorage> weak_factory_;
 
   bool simulate_make_group_obsolete_failure_;
   bool simulate_store_group_and_newest_cache_failure_;
 
   bool simulate_find_main_resource_;
   bool simulate_find_sub_resource_;
   AppCacheEntry simulated_found_entry_;
   AppCacheEntry simulated_found_fallback_entry_;
   int64 simulated_found_cache_id_;
   int64 simulated_found_group_id_;
@@ skipping 18 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(MockAppCacheStorageTest,
                            StoreExistingGroupExistingCache);
   FRIEND_TEST_ALL_PREFIXES(AppCacheServiceTest, DeleteAppCachesForOrigin);
 
   DISALLOW_COPY_AND_ASSIGN(MockAppCacheStorage);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_MOCK_APPCACHE_STORAGE_H_