Use base::Callback in Quota related code.

chrome/browser/browsing_data_quota_helper_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 "testing/gtest/include/gtest/gtest.h"
 
+#include "base/bind.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/message_loop_proxy.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/browsing_data_quota_helper_impl.h"
 #include "webkit/quota/mock_storage_client.h"
 #include "webkit/quota/quota_manager.h"
 
 class BrowsingDataQuotaHelperTest : public testing::Test {
  public:
   typedef BrowsingDataQuotaHelper::QuotaInfo QuotaInfo;
   typedef BrowsingDataQuotaHelper::QuotaInfoArray QuotaInfoArray;
 
   BrowsingDataQuotaHelperTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB, &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_),
         fetching_completed_(true),
         quota_(-1),
+        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
         callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
 
   virtual ~BrowsingDataQuotaHelperTest() {}
 
   virtual void SetUp() OVERRIDE {
     EXPECT_TRUE(dir_.CreateUniqueTempDir());
     quota_manager_ = new quota::QuotaManager(
         false, dir_.path(),
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
@@ skipping 31 matching lines @@
     quota::MockStorageClient* client =
         new quota::MockStorageClient(
             quota_manager_->proxy(), data, data_len);
     quota_manager_->proxy()->RegisterClient(client);
     client->TouchAllOriginsAndNotify();
   }
 
   void SetPersistentHostQuota(const std::string& host, int64 quota) {
     quota_ = -1;
     quota_manager_->SetPersistentHostQuota(
-        host, quota, callback_factory_.NewCallback(
-            &BrowsingDataQuotaHelperTest::GotPersistentHostQuota));
+        host, quota,
+        base::Bind(&BrowsingDataQuotaHelperTest::GotPersistentHostQuota,
+                   weak_factory_.GetWeakPtr()));
   }
 
   void GetPersistentHostQuota(const std::string& host) {
     quota_ = -1;
     quota_manager_->GetPersistentHostQuota(
-        host, callback_factory_.NewCallback(
-            &BrowsingDataQuotaHelperTest::GotPersistentHostQuota));
+        host,
+        base::Bind(&BrowsingDataQuotaHelperTest::GotPersistentHostQuota,
+                   weak_factory_.GetWeakPtr()));
   }
 
   void GotPersistentHostQuota(quota::QuotaStatusCode status,
                               const std::string& host,
                               quota::StorageType type,
                               int64 quota) {
     EXPECT_EQ(quota::kQuotaStatusOk, status);
     EXPECT_EQ(quota::kStorageTypePersistent, type);
     quota_ = quota;
   }
@@ skipping 17 matching lines @@
   BrowserThread db_thread_;
   BrowserThread io_thread_;
   scoped_refptr<quota::QuotaManager> quota_manager_;
 
   ScopedTempDir dir_;
   scoped_refptr<BrowsingDataQuotaHelper> helper_;
 
   bool fetching_completed_;
   QuotaInfoArray quota_info_;
   int64 quota_;
+  base::WeakPtrFactory<BrowsingDataQuotaHelperTest> weak_factory_;
   base::ScopedCallbackFactory<BrowsingDataQuotaHelperTest> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataQuotaHelperTest);
 };
 
 TEST_F(BrowsingDataQuotaHelperTest, Empty) {
   StartFetching();
   MessageLoop::current()->RunAllPending();
   EXPECT_TRUE(fetching_completed());
   EXPECT_TRUE(quota_info().empty());
@@ skipping 31 matching lines @@
   MessageLoop::current()->RunAllPending();
 
   GetPersistentHostQuota(kHost1);
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(0, quota());
 
   GetPersistentHostQuota(kHost2);
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(10, quota());
 }