Use base::Callback in Quota related code.

webkit/appcache/appcache_quota_client_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 <map>
+#include <set>
 
+#include "base/bind.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/appcache/appcache_quota_client.h"
 #include "webkit/appcache/mock_appcache_service.h"
 
 namespace appcache {
 
@@ skipping 10 matching lines @@
 
   AppCacheQuotaClientTest()
       : kOriginA("http://host"),
         kOriginB("http://host:8000"),
         kOriginOther("http://other"),
         usage_(0),
         delete_status_(quota::kQuotaStatusUnknown),
         num_get_origin_usage_completions_(0),
         num_get_origins_completions_(0),
         num_delete_origins_completions_(0),
-        callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   }
 
   int64 GetOriginUsage(
       quota::QuotaClient* client,
       const GURL& origin,
       quota::StorageType type) {
     usage_ = -1;
     AsyncGetOriginUsage(client, origin, type);
     MessageLoop::current()->RunAllPending();
     return usage_;
@@ skipping 25 matching lines @@
     delete_status_ = quota::kQuotaStatusUnknown;
     AsyncDeleteOriginData(client, type, origin);
     MessageLoop::current()->RunAllPending();
     return delete_status_;
   }
 
   void AsyncGetOriginUsage(
       quota::QuotaClient* client,
       const GURL& origin,
       quota::StorageType type) {
-    client->GetOriginUsage(origin, type,
-        callback_factory_.NewCallback(
-            &AppCacheQuotaClientTest::OnGetOriginUsageComplete));
+    client->GetOriginUsage(
+        origin, type,
+        base::Bind(&AppCacheQuotaClientTest::OnGetOriginUsageComplete,
+                   weak_factory_.GetWeakPtr()));
   }
 
   void AsyncGetOriginsForType(
       quota::QuotaClient* client,
       quota::StorageType type) {
-    client->GetOriginsForType(type,
-        callback_factory_.NewCallback(
-            &AppCacheQuotaClientTest::OnGetOriginsComplete));
+    client->GetOriginsForType(
+        type,
+        base::Bind(&AppCacheQuotaClientTest::OnGetOriginsComplete,
+                   weak_factory_.GetWeakPtr()));
   }
 
   void AsyncGetOriginsForHost(
       quota::QuotaClient* client,
       quota::StorageType type,
       const std::string& host) {
-    client->GetOriginsForHost(type, host,
-        callback_factory_.NewCallback(
-            &AppCacheQuotaClientTest::OnGetOriginsComplete));
+    client->GetOriginsForHost(
+        type, host,
+        base::Bind(&AppCacheQuotaClientTest::OnGetOriginsComplete,
+                   weak_factory_.GetWeakPtr()));
   }
 
   void AsyncDeleteOriginData(
       quota::QuotaClient* client,
       quota::StorageType type,
       const GURL& origin) {
-    client->DeleteOriginData(origin, type,
-        callback_factory_.NewCallback(
-            &AppCacheQuotaClientTest::OnDeleteOriginDataComplete));
+    client->DeleteOriginData(
+        origin, type,
+        base::Bind(&AppCacheQuotaClientTest::OnDeleteOriginDataComplete,
+                   weak_factory_.GetWeakPtr()));
   }
 
   void SetUsageMapEntry(const GURL& origin, int64 usage) {
     mock_service_.storage()->usage_map_[origin] = usage;
   }
 
   AppCacheQuotaClient* CreateClient() {
     return new AppCacheQuotaClient(&mock_service_);
   }
 
@@ skipping 28 matching lines @@
   }
 
   int64 usage_;
   std::set<GURL> origins_;
   quota::StorageType type_;
   quota::QuotaStatusCode delete_status_;
   int num_get_origin_usage_completions_;
   int num_get_origins_completions_;
   int num_delete_origins_completions_;
   MockAppCacheService mock_service_;
-  base::ScopedCallbackFactory<AppCacheQuotaClientTest> callback_factory_;
+  base::WeakPtrFactory<AppCacheQuotaClientTest> weak_factory_;
 };
 
 
 TEST_F(AppCacheQuotaClientTest, BasicCreateDestroy) {
   AppCacheQuotaClient* client = CreateClient();
   Call_NotifyAppCacheReady(client);
   Call_OnQuotaManagerDestroyed(client);
   Call_NotifyAppCacheDestroyed(client);
 }
 
@@ skipping 252 matching lines @@
   // A real completion callback from the service should
   // be dropped if it comes in after NotifyAppCacheDestroyed.
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(1, num_delete_origins_completions_);
   EXPECT_EQ(quota::kQuotaErrorAbort, delete_status_);
 
   Call_OnQuotaManagerDestroyed(client);
 }
 
 }  // namespace appcache