Use base::Callback in Quota related code.

webkit/database/database_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 "base/bind.h"
 #include "base/file_path.h"
-#include "base/memory/scoped_callback_factory.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/database/database_quota_client.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/database/database_util.h"
 
 namespace webkit_database {
@@ skipping 100 matching lines @@
   const GURL kOriginA;
   const GURL kOriginB;
   const GURL kOriginOther;
 
   DatabaseQuotaClientTest()
       : kOriginA("http://host"),
         kOriginB("http://host:8000"),
         kOriginOther("http://other"),
         usage_(0),
         mock_tracker_(new MockDatabaseTracker),
-        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_ = 0;
-    client->GetOriginUsage(origin, type,
-        callback_factory_.NewCallback(
-            &DatabaseQuotaClientTest::OnGetOriginUsageComplete));
+    client->GetOriginUsage(
+        origin, type,
+        base::Bind(&DatabaseQuotaClientTest::OnGetOriginUsageComplete,
+                   weak_factory_.GetWeakPtr()));
     MessageLoop::current()->RunAllPending();
     return usage_;
   }
 
   const std::set<GURL>& GetOriginsForType(
       quota::QuotaClient* client,
       quota::StorageType type) {
     origins_.clear();
-    client->GetOriginsForType(type,
-        callback_factory_.NewCallback(
-            &DatabaseQuotaClientTest::OnGetOriginsComplete));
+    client->GetOriginsForType(
+        type,
+        base::Bind(&DatabaseQuotaClientTest::OnGetOriginsComplete,
+                   weak_factory_.GetWeakPtr()));
     MessageLoop::current()->RunAllPending();
     return origins_;
   }
 
   const std::set<GURL>& GetOriginsForHost(
       quota::QuotaClient* client,
       quota::StorageType type,
       const std::string& host) {
     origins_.clear();
-    client->GetOriginsForHost(type, host,
-        callback_factory_.NewCallback(
-            &DatabaseQuotaClientTest::OnGetOriginsComplete));
+    client->GetOriginsForHost(
+        type, host,
+        base::Bind(&DatabaseQuotaClientTest::OnGetOriginsComplete,
+                   weak_factory_.GetWeakPtr()));
     MessageLoop::current()->RunAllPending();
     return origins_;
   }
 
   bool DeleteOriginData(
       quota::QuotaClient* client,
       quota::StorageType type,
       const GURL& origin) {
     delete_status_ = quota::kQuotaStatusUnknown;
-    client->DeleteOriginData(origin, type,
-        callback_factory_.NewCallback(
-            &DatabaseQuotaClientTest::OnDeleteOriginDataComplete));
+    client->DeleteOriginData(
+        origin, type,
+        base::Bind(&DatabaseQuotaClientTest::OnDeleteOriginDataComplete,
+                   weak_factory_.GetWeakPtr()));
     MessageLoop::current()->RunAllPending();
     return delete_status_ == quota::kQuotaStatusOk;
   }
 
   MockDatabaseTracker* mock_tracker() { return mock_tracker_.get(); }
 
 
  private:
   void OnGetOriginUsageComplete(int64 usage) {
     usage_ = usage;
   }
 
   void OnGetOriginsComplete(const std::set<GURL>& origins,
       quota::StorageType type) {
     origins_ = origins;
     type_ = type;
   }
 
   void OnDeleteOriginDataComplete(quota::QuotaStatusCode status) {
     delete_status_ = status;
   }
 
   int64 usage_;
   std::set<GURL> origins_;
   quota::StorageType type_;
   quota::QuotaStatusCode delete_status_;
   scoped_refptr<MockDatabaseTracker> mock_tracker_;
-  base::ScopedCallbackFactory<DatabaseQuotaClientTest> callback_factory_;
+  base::WeakPtrFactory<DatabaseQuotaClientTest> weak_factory_;
 };
 
 
 TEST_F(DatabaseQuotaClientTest, GetOriginUsage) {
   DatabaseQuotaClient client(
       base::MessageLoopProxy::current(),
       mock_tracker());
 
   EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kTemp));
   EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kPerm));
@@ skipping 61 matching lines @@
   mock_tracker()->set_async_delete(false);
   EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA));
   EXPECT_EQ(1, mock_tracker()->delete_called_count());
 
   mock_tracker()->set_async_delete(true);
   EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA));
   EXPECT_EQ(2, mock_tracker()->delete_called_count());
 }
 
 }  // namespace webkit_database