Use base::Callback in Quota related code.

webkit/fileapi/file_system_quota_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.
 
 // This test checks the entire behavior of FileSystem usage and quota, such as:
 // 1) the actual size of files on disk,
 // 2) the described size in .usage, and
 // 3) the result of QuotaManager::GetUsageAndQuota.
 
+#include "base/bind.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_test_helper.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/local_file_util.h"
 #include "webkit/fileapi/quota_file_util.h"
 #include "webkit/quota/quota_manager.h"
 
 namespace fileapi {
 
 const int kFileOperationStatusNotSet = 1;
 
 class FileSystemQuotaTest : public testing::Test {
  public:
   FileSystemQuotaTest()
       : local_file_util_(new LocalFileUtil(QuotaFileUtil::CreateDefault())),
-        callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
         status_(kFileOperationStatusNotSet),
         quota_status_(quota::kQuotaStatusUnknown),
         usage_(-1),
         quota_(-1) {}
 
   FileSystemOperation* operation();
 
   void set_status(int status) { status_ = status; }
   int status() const { return status_; }
   quota::QuotaStatusCode quota_status() const { return quota_status_; }
@@ skipping 21 matching lines @@
     return test_helper_.ComputeCurrentOriginUsage();
   }
 
   int64 SizeInUsageFile() {
     return test_helper_.GetCachedOriginUsage();
   }
 
   void GetUsageAndQuotaFromQuotaManager() {
     quota_manager_->GetUsageAndQuota(
         test_helper_.origin(), test_helper_.storage_type(),
-        callback_factory_.NewCallback(
-            &FileSystemQuotaTest::OnGetUsageAndQuota));
+        base::Bind(&FileSystemQuotaTest::OnGetUsageAndQuota,
+                   weak_factory_.GetWeakPtr()));
     MessageLoop::current()->RunAllPending();
   }
 
   bool VirtualFileExists(const FilePath& virtual_path) {
     return file_util::PathExists(PlatformPath(virtual_path)) &&
         !file_util::DirectoryExists(PlatformPath(virtual_path));
   }
 
   bool VirtualDirectoryExists(const FilePath& virtual_path) {
     return file_util::DirectoryExists(PlatformPath(virtual_path));
@@ skipping 26 matching lines @@
   FilePath grandchild_file1_path_;
   FilePath grandchild_file2_path_;
 
  protected:
   FileSystemTestOriginHelper test_helper_;
 
   ScopedTempDir work_dir_;
   scoped_refptr<quota::QuotaManager> quota_manager_;
   scoped_ptr<LocalFileUtil> local_file_util_;
 
-  base::ScopedCallbackFactory<FileSystemQuotaTest> callback_factory_;
+  base::WeakPtrFactory<FileSystemQuotaTest> weak_factory_;
 
   // For post-operation status.
   int status_;
   quota::QuotaStatusCode quota_status_;
   int64 usage_;
   int64 quota_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemQuotaTest);
 };
 
@@ skipping 192 matching lines @@
 
   EXPECT_EQ(2 * child_file_size + 3 * grandchild_file_size, ActualSize());
   EXPECT_EQ(2 * child_file_size + 3 * grandchild_file_size, SizeInUsageFile());
   GetUsageAndQuotaFromQuotaManager();
   EXPECT_EQ(quota::kQuotaStatusOk, quota_status());
   EXPECT_EQ(2 * child_file_size + 3 * grandchild_file_size, usage());
   ASSERT_LT(2 * child_file_size + 3 * grandchild_file_size, quota());
 }
 
 }  // namespace fileapi