Use base::Callback in Quota related code.

webkit/fileapi/file_system_operation.h

 // 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.
 
 #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_H_
 
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 93 matching lines @@
   }
 
   friend class FileSystemOperationTest;
   friend class FileSystemOperationWriteTest;
   friend class FileWriterDelegateTest;
   friend class FileSystemTestOriginHelper;
   friend class FileSystemQuotaTest;
 
   void GetUsageAndQuotaThenCallback(
       const GURL& origin_url,
-      quota::QuotaManager::GetUsageAndQuotaCallback* callback);
+      quota::QuotaManager::GetUsageAndQuotaCallback callback);

[awong, 2011/09/29 18:05:15]

const &

[tzik, 2011/10/11 04:53:57]

Done.

 
   void DelayedCreateFileForQuota(quota::QuotaStatusCode status,
                                  int64 usage, int64 quota);
   void DelayedCreateDirectoryForQuota(quota::QuotaStatusCode status,
                                       int64 usage, int64 quota);
   void DelayedCopyForQuota(quota::QuotaStatusCode status,
                            int64 usage, int64 quota);
   void DelayedMoveForQuota(quota::QuotaStatusCode status,
                            int64 usage, int64 quota);
   void DelayedWriteForQuota(quota::QuotaStatusCode status,
@@ skipping 108 matching lines @@
   OperationType pending_operation_;
 #endif
 
   // Proxy for calling file_util_proxy methods.
   scoped_refptr<base::MessageLoopProxy> proxy_;
 
   scoped_ptr<FileSystemCallbackDispatcher> dispatcher_;
 
   FileSystemOperationContext file_system_operation_context_;
 
+  base::WeakPtrFactory<FileSystemOperation> weak_factory_;
   base::ScopedCallbackFactory<FileSystemOperation> callback_factory_;
 
   scoped_ptr<ScopedQuotaUtilHelper> quota_util_helper_;
 
   // These are all used only by Write().
   friend class FileWriterDelegate;
   scoped_ptr<FileWriterDelegate> file_writer_delegate_;
   scoped_ptr<net::URLRequest> blob_request_;
   scoped_ptr<FileSystemOperation> cancel_operation_;
 
@@ skipping 16 matching lines @@
 
   // Length to be truncated.
   int64 length_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemOperation);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_H_