Use base::Callback in Quota related code.

webkit/fileapi/file_system_operation_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 "webkit/fileapi/file_system_operation.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 33 matching lines @@
                    base::MessageLoopProxy::current(),
                    NULL),
       origin_(origin),
       type_(type),
       usage_(0),
       quota_(kint64max),
       accessed_(0) {}
 
   virtual void GetUsageAndQuota(
       const GURL& origin, quota::StorageType type,
-      GetUsageAndQuotaCallback* callback) {
+      GetUsageAndQuotaCallback callback) OVERRIDE {

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

const &.

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

Done.

     EXPECT_EQ(origin_, origin);
     EXPECT_EQ(type_, type);
-    callback->Run(quota::kQuotaStatusOk, usage_, quota_);
-    delete callback;
+    callback.Run(quota::kQuotaStatusOk, usage_, quota_);
   }
 
  private:
   friend class MockQuotaManagerProxy;
   void SetQuota(const GURL& origin, StorageType type, int64 quota) {
     EXPECT_EQ(origin_, origin);
     EXPECT_EQ(type_, type);
     quota_ = quota;
   }
 
@@ skipping 21 matching lines @@
   explicit MockQuotaManagerProxy(QuotaManager* quota_manager)
       : QuotaManagerProxy(quota_manager,
                           base::MessageLoopProxy::current()),
         registered_client_(NULL) {
   }
 
   virtual ~MockQuotaManagerProxy() {
     EXPECT_FALSE(registered_client_);
   }
 
-  virtual void RegisterClient(QuotaClient* client) {
+  virtual void RegisterClient(QuotaClient* client) OVERRIDE {
     EXPECT_FALSE(registered_client_);
     registered_client_ = client;
   }
 
   void SimulateQuotaManagerDestroyed() {
     if (registered_client_) {
       // We cannot call this in the destructor as the client (indirectly)
       // holds a refptr of the proxy.
       registered_client_->OnQuotaManagerDestroyed();
       registered_client_ = NULL;
@@ skipping 869 matching lines @@
 
   EXPECT_TRUE(file_util::GetFileInfo(platform_path, &info));
   // We compare as time_t here to lower our resolution, to avoid false
   // negatives caused by conversion to the local filesystem's native
   // representation and back.
   EXPECT_EQ(new_modified_time.ToTimeT(), info.last_modified.ToTimeT());
   EXPECT_EQ(new_accessed_time.ToTimeT(), info.last_accessed.ToTimeT());
 }
 
 }  // namespace fileapi