base::Bind: Convert AppCacheHelper::DeleteAppCachesForOrigin.

webkit/appcache/appcache_service_unittest.cc

Index: webkit/appcache/appcache_service_unittest.cc
diff --git a/webkit/appcache/appcache_service_unittest.cc b/webkit/appcache/appcache_service_unittest.cc
index 0182f862ec9df4754add4b240aa3f45c51d29d57..1a58964c44d1a29e3dbc62b066db2c14fe88c603 100644
--- a/webkit/appcache/appcache_service_unittest.cc
+++ b/webkit/appcache/appcache_service_unittest.cc
@@ -5,6 +5,7 @@
 #include <string>
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/pickle.h"
 #include "net/base/completion_callback.h"
@@ -89,7 +90,8 @@ class AppCacheServiceTest : public testing::Test {
         service_(new AppCacheService(NULL)),
         delete_result_(net::OK), delete_completion_count_(0),
         ALLOW_THIS_IN_INITIALIZER_LIST(deletion_callback_(
-            this, &AppCacheServiceTest::OnDeleteAppCachesComplete)) {
+            base::Bind(&AppCacheServiceTest::OnDeleteAppCachesComplete,
+                       base::Unretained(this)))) {
     // Setup to use mock storage.
     service_->storage_.reset(new MockAppCacheStorage(service_.get()));
   }
@@ -172,12 +174,12 @@ class AppCacheServiceTest : public testing::Test {
   scoped_ptr<AppCacheService> service_;
   int delete_result_;
   int delete_completion_count_;
-  net::OldCompletionCallbackImpl<AppCacheServiceTest> deletion_callback_;
+  net::CompletionCallback deletion_callback_;
 };
 
 TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) {
   // Without giving mock storage simiulated info, should fail.
-  service_->DeleteAppCachesForOrigin(kOrigin, &deletion_callback_);
+  service_->DeleteAppCachesForOrigin(kOrigin, deletion_callback_);
   EXPECT_EQ(0, delete_completion_count_);
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(1, delete_completion_count_);
@@ -186,7 +188,7 @@ TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) {
 
   // Should succeed given an empty info collection.
   mock_storage()->SimulateGetAllInfo(new AppCacheInfoCollection);
-  service_->DeleteAppCachesForOrigin(kOrigin, &deletion_callback_);
+  service_->DeleteAppCachesForOrigin(kOrigin, deletion_callback_);
   EXPECT_EQ(0, delete_completion_count_);
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(1, delete_completion_count_);
@@ -208,7 +210,7 @@ TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) {
   info_vector.push_back(mock_manifest_3);
   info->infos_by_origin[kOrigin] = info_vector;
   mock_storage()->SimulateGetAllInfo(info);
-  service_->DeleteAppCachesForOrigin(kOrigin, &deletion_callback_);
+  service_->DeleteAppCachesForOrigin(kOrigin, deletion_callback_);
   EXPECT_EQ(0, delete_completion_count_);
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(1, delete_completion_count_);
@@ -219,7 +221,7 @@ TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) {
   info->infos_by_origin[kOrigin] = info_vector;
   mock_storage()->SimulateGetAllInfo(info);
   mock_storage()->SimulateMakeGroupObsoleteFailure();
-  service_->DeleteAppCachesForOrigin(kOrigin, &deletion_callback_);
+  service_->DeleteAppCachesForOrigin(kOrigin, deletion_callback_);
   EXPECT_EQ(0, delete_completion_count_);
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(1, delete_completion_count_);
@@ -228,7 +230,7 @@ TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) {
 
   // Should complete with abort error if the service is deleted
   // prior to a delete completion.
-  service_->DeleteAppCachesForOrigin(kOrigin, &deletion_callback_);
+  service_->DeleteAppCachesForOrigin(kOrigin, deletion_callback_);
   EXPECT_EQ(0, delete_completion_count_);
   service_.reset();  // kill it
   EXPECT_EQ(1, delete_completion_count_);