Use base::Callback in Quota related code.

content/browser/in_process_webkit/indexed_db_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/file_util.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/scoped_temp_dir.h"
 #include "content/browser/in_process_webkit/indexed_db_context.h"
 #include "content/browser/in_process_webkit/indexed_db_quota_client.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/test/test_browser_context.h"
@@ skipping 11 matching lines @@
  public:
   const GURL kOriginA;
   const GURL kOriginB;
   const GURL kOriginOther;
 
   IndexedDBQuotaClientTest()
       : kOriginA("http://host"),
         kOriginB("http://host:8000"),
         kOriginOther("http://other"),
         usage_(0),
-        callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
         message_loop_(MessageLoop::TYPE_IO),
         webkit_thread_(BrowserThread::WEBKIT, &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_) {
     TestBrowserContext browser_context;
     idb_context_ = browser_context.GetWebKitContext()->indexed_db_context();
     setup_temp_dir();
   }
   void setup_temp_dir() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     FilePath indexeddb_dir = temp_dir_.path().Append(
         IndexedDBContext::kIndexedDBDirectory);
     ASSERT_TRUE(file_util::CreateDirectory(indexeddb_dir));
     idb_context()->set_data_path_for_testing(indexeddb_dir);
   }
 
   ~IndexedDBQuotaClientTest() {
     // IndexedDBContext needs to be destructed on BrowserThread::WEBKIT, which
     // is also a member variable of this class.  Cause IndexedDBContext's
     // destruction now to ensure that it doesn't outlive BrowserThread::WEBKIT.
     idb_context_ = NULL;
     MessageLoop::current()->RunAllPending();
   }
 
   int64 GetOriginUsage(
       quota::QuotaClient* client,
       const GURL& origin,
       quota::StorageType type) {
     usage_ = -1;
-    client->GetOriginUsage(origin, type,
-        callback_factory_.NewCallback(
-            &IndexedDBQuotaClientTest::OnGetOriginUsageComplete));
+    client->GetOriginUsage(
+        origin, type,
+        base::Bind(&IndexedDBQuotaClientTest::OnGetOriginUsageComplete,
+                   weak_factory_.GetWeakPtr()));
     MessageLoop::current()->RunAllPending();
     EXPECT_GT(usage_, -1);
     return usage_;
   }
 
   const std::set<GURL>& GetOriginsForType(
       quota::QuotaClient* client,
       quota::StorageType type) {
     origins_.clear();
     type_ = quota::kStorageTypeTemporary;
-    client->GetOriginsForType(type,
-        callback_factory_.NewCallback(
-            &IndexedDBQuotaClientTest::OnGetOriginsComplete));
+    client->GetOriginsForType(
+        type,
+        base::Bind(&IndexedDBQuotaClientTest::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();
     type_ = quota::kStorageTypeTemporary;
-    client->GetOriginsForHost(type, host,
-        callback_factory_.NewCallback(
-            &IndexedDBQuotaClientTest::OnGetOriginsComplete));
+    client->GetOriginsForHost(
+        type, host,
+        base::Bind(&IndexedDBQuotaClientTest::OnGetOriginsComplete,
+                   weak_factory_.GetWeakPtr()));
     MessageLoop::current()->RunAllPending();
     return origins_;
   }
 
   quota::QuotaStatusCode DeleteOrigin(quota::QuotaClient* client,
                                       const GURL& origin_url) {
     delete_status_ = quota::kQuotaStatusUnknown;
-    client->DeleteOriginData(origin_url, kTemp, callback_factory_.NewCallback(
-        &IndexedDBQuotaClientTest::OnDeleteOriginComplete));
+    client->DeleteOriginData(
+        origin_url, kTemp,
+        base::Bind(&IndexedDBQuotaClientTest::OnDeleteOriginComplete,
+                   weak_factory_.GetWeakPtr()));
     MessageLoop::current()->RunAllPending();
     return delete_status_;
   }
 
   IndexedDBContext* idb_context() { return idb_context_.get(); }
 
   void SetFileSizeTo(const FilePath& path, int size) {
     std::string junk(size, 'a');
     ASSERT_EQ(size, file_util::WriteFile(path, junk.c_str(), size));
   }
@@ skipping 23 matching lines @@
 
   void OnDeleteOriginComplete(quota::QuotaStatusCode code) {
     delete_status_ = code;
   }
 
   ScopedTempDir temp_dir_;
   int64 usage_;
   std::set<GURL> origins_;
   quota::StorageType type_;
   scoped_refptr<IndexedDBContext> idb_context_;
-  base::ScopedCallbackFactory<IndexedDBQuotaClientTest> callback_factory_;
+  base::WeakPtrFactory<IndexedDBQuotaClientTest> weak_factory_;
   MessageLoop message_loop_;
   BrowserThread webkit_thread_;
   BrowserThread io_thread_;
   quota::QuotaStatusCode delete_status_;
 };
 
 
 TEST_F(IndexedDBQuotaClientTest, GetOriginUsage) {
   IndexedDBQuotaClient client(
       base::MessageLoopProxy::current(),
@@ skipping 63 matching lines @@
   AddFakeIndexedDB(kOriginA, 1000);
   AddFakeIndexedDB(kOriginB, 50);
   EXPECT_EQ(1000, GetOriginUsage(&client, kOriginA, kTemp));
   EXPECT_EQ(50, GetOriginUsage(&client, kOriginB, kTemp));
 
   quota::QuotaStatusCode delete_status = DeleteOrigin(&client, kOriginA);
   EXPECT_EQ(quota::kQuotaStatusOk, delete_status);
   EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kTemp));
   EXPECT_EQ(50, GetOriginUsage(&client, kOriginB, kTemp));
 }