base::Bind: Convert AppCacheHelper::DeleteAppCachesForOrigin.

webkit/appcache/appcache_service_unittest.cc

 // 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.
 
 #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"
 #include "net/base/io_buffer.h"
 #include "net/http/http_response_headers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/appcache/appcache_response.h"
 #include "webkit/appcache/appcache_service.h"
 #include "webkit/appcache/mock_appcache_storage.h"
 
@@ skipping 64 matching lines @@
 
 
 class AppCacheServiceTest : public testing::Test {
  public:
   AppCacheServiceTest()
       : kOrigin("http://hello/"),
         kManifestUrl(kOrigin.Resolve("manifest")),
         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()));
   }
 
   void OnDeleteAppCachesComplete(int result) {
     delete_result_ = result;
     ++delete_completion_count_;
   }
 
   MockAppCacheStorage* mock_storage() {
@@ skipping 62 matching lines @@
     info->Persist(pickle, kSkipTransientHeaders, kTruncated);
     return pickle->size();
   }
 
   const GURL kOrigin;
   const GURL kManifestUrl;
 
   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_);
   EXPECT_EQ(net::ERR_FAILED, delete_result_);
   delete_completion_count_ = 0;
 
   // 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_);
   EXPECT_EQ(net::OK, delete_result_);
   delete_completion_count_ = 0;
 
   scoped_refptr<AppCacheInfoCollection> info(new AppCacheInfoCollection);
 
   // Should succeed given a non-empty info collection.
   AppCacheInfo mock_manifest_1;
   AppCacheInfo mock_manifest_2;
   AppCacheInfo mock_manifest_3;
   mock_manifest_1.manifest_url = kOrigin.Resolve("manifest1");
   mock_manifest_2.manifest_url = kOrigin.Resolve("manifest2");
   mock_manifest_3.manifest_url = kOrigin.Resolve("manifest3");
   AppCacheInfoVector info_vector;
   info_vector.push_back(mock_manifest_1);
   info_vector.push_back(mock_manifest_2);
   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_);
   EXPECT_EQ(net::OK, delete_result_);
   delete_completion_count_ = 0;
 
   // Should fail if storage fails to delete.
   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_);
   EXPECT_EQ(net::ERR_FAILED, delete_result_);
   delete_completion_count_ = 0;
 
   // 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_);
   EXPECT_EQ(net::ERR_ABORTED, delete_result_);
   delete_completion_count_ = 0;
 
   // Let any tasks lingering from the sudden deletion run and verify
   // no other completion calls occur.
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(0, delete_completion_count_);
@@ skipping 64 matching lines @@
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(0, CountPendingHelpers());
   EXPECT_FALSE(IsGroupStored(kManifestUrl));
   ResetStorage();
 
   service_.reset();  // Clean up.
   MessageLoop::current()->RunAllPending();
 }
 
 }  // namespace appcache