Use base::Callback in Quota related code.

webkit/quota/mock_quota_manager.cc

Index: webkit/quota/mock_quota_manager.cc
diff --git a/webkit/quota/mock_quota_manager.cc b/webkit/quota/mock_quota_manager.cc
index 67f1ee3ebf9d4ad91de3aaf4c5448aada155a41e..7773d349cbadbd0c76f0a9c03d1203a6c654d2a6 100644
--- a/webkit/quota/mock_quota_manager.cc
+++ b/webkit/quota/mock_quota_manager.cc
@@ -23,7 +23,7 @@ class MockQuotaManager::GetModifiedSinceTask : public QuotaThreadTask {
   GetModifiedSinceTask(MockQuotaManager* manager,
                        const std::set<GURL>& origins,
                        StorageType type,
-                       GetOriginsCallback* callback)
+                       GetOriginsCallback callback)

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

const &.

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

Done.

       : QuotaThreadTask(manager, manager->io_thread_),
         origins_(origins),
         type_(type),
@@ -33,17 +33,17 @@ class MockQuotaManager::GetModifiedSinceTask : public QuotaThreadTask {
   virtual void RunOnTargetThread() OVERRIDE {}
 
   virtual void Completed() OVERRIDE {
-    callback_->Run(origins_, type_);
+    callback_.Run(origins_, type_);
   }
 
   virtual void Aborted() OVERRIDE {
-    callback_->Run(std::set<GURL>(), type_);
+    callback_.Run(std::set<GURL>(), type_);
   }
 
  private:
   std::set<GURL> origins_;
   StorageType type_;
-  scoped_ptr<GetOriginsCallback> callback_;
+  GetOriginsCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(GetModifiedSinceTask);
 };
@@ -51,7 +51,7 @@ class MockQuotaManager::GetModifiedSinceTask : public QuotaThreadTask {
 class MockQuotaManager::DeleteOriginDataTask : public QuotaThreadTask {
  public:
   DeleteOriginDataTask(MockQuotaManager* manager,
-                       StatusCallback* callback)
+                       StatusCallback callback)

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

const &.

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

Done.

       : QuotaThreadTask(manager, manager->io_thread_),
         callback_(callback) {}
 
@@ -59,15 +59,15 @@ class MockQuotaManager::DeleteOriginDataTask : public QuotaThreadTask {
   virtual void RunOnTargetThread() OVERRIDE {}
 
   virtual void Completed() OVERRIDE {
-    callback_->Run(quota::kQuotaStatusOk);
+    callback_.Run(quota::kQuotaStatusOk);
   }
 
   virtual void Aborted() OVERRIDE {
-    callback_->Run(quota::kQuotaErrorAbort);
+    callback_.Run(quota::kQuotaErrorAbort);
   }
 
  private:
-  scoped_ptr<StatusCallback> callback_;
+  StatusCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(DeleteOriginDataTask);
 };
@@ -111,7 +111,7 @@ bool MockQuotaManager::OriginHasData(const GURL& origin,
 }
 
 void MockQuotaManager::GetOriginsModifiedSince(StorageType type,
-    base::Time modified_since, GetOriginsCallback* callback) {
+    base::Time modified_since, GetOriginsCallback callback) {

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

const &.

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

Done.

   std::set<GURL> origins_to_return;
   for (std::vector<OriginInfo>::const_iterator current = origins_.begin();
        current != origins_.end();
@@ -124,7 +124,7 @@ void MockQuotaManager::GetOriginsModifiedSince(StorageType type,
 }
 
 void MockQuotaManager::DeleteOriginData(const GURL& origin, StorageType type,
-    StatusCallback* callback) {
+    StatusCallback callback) {

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

const &.

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

Done.

   for (std::vector<OriginInfo>::iterator current = origins_.begin();
        current != origins_.end();
        ++current) {