Quota: Add quota::StorageType to the GetOriginsCallback definition.

webkit/appcache/appcache_quota_client.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/appcache/appcache_quota_client.h"
 
 #include <algorithm>
 #include <map>
 
 #include "webkit/appcache/appcache_service.h"
@@ skipping 85 matching lines @@
     GetOriginsCallback* callback_ptr) {
   GetOriginsHelper(type, std::string(), callback_ptr);
 }
 
 void AppCacheQuotaClient::GetOriginsForHost(
     quota::StorageType type,
     const std::string& host,
     GetOriginsCallback* callback_ptr) {
   DCHECK(callback_ptr);
   if (host.empty()) {
-    callback_ptr->Run(std::set<GURL>());
+    callback_ptr->Run(std::set<GURL>(), type);
     delete callback_ptr;
     return;
   }
   GetOriginsHelper(type, host, callback_ptr);
 }
 
 void AppCacheQuotaClient::DeleteOriginData(const GURL& origin,
                                            quota::StorageType type,
                                            DeletionCallback* callback_ptr) {
   DCHECK(callback_ptr);
@@ skipping 42 matching lines @@
 
 void AppCacheQuotaClient::GetOriginsHelper(
     quota::StorageType type,
     const std::string& opt_host,
     GetOriginsCallback* callback_ptr) {
   DCHECK(callback_ptr);
   DCHECK(!quota_manager_is_destroyed_);
 
   scoped_ptr<GetOriginsCallback> callback(callback_ptr);
   if (!service_) {
-    callback->Run(std::set<GURL>());
+    callback->Run(std::set<GURL>(), type);
     return;
   }
 
   if (!appcache_is_ready_) {
     pending_origins_requests_.push_back(OriginsRequest());
     pending_origins_requests_.back().opt_host = opt_host;
     pending_origins_requests_.back().type = type;
     pending_origins_requests_.back().callback = callback.release();
     return;
   }
 
   if (type == quota::kStorageTypePersistent) {
-    callback->Run(std::set<GURL>());
+    callback->Run(std::set<GURL>(), type);
     return;
   }
 
   const AppCacheStorage::UsageMap* map = GetUsageMap();
   std::set<GURL> origins;
   for (AppCacheStorage::UsageMap::const_iterator iter = map->begin();
        iter != map->end(); ++iter) {
     if (opt_host.empty() || iter->first.host() == opt_host)
       origins.insert(iter->first);
   }
-  callback->Run(origins);
+  callback->Run(origins, type);
 }
 
 void AppCacheQuotaClient::ProcessPendingRequests() {
   DCHECK(appcache_is_ready_);
   while (!pending_usage_requests_.empty()) {
     UsageRequest& request = pending_usage_requests_.front();
     GetOriginUsage(request.origin, request.type, request.callback);
     pending_usage_requests_.pop_front();
   }
   while (!pending_origins_requests_.empty()) {
     OriginsRequest& request = pending_origins_requests_.front();
     GetOriginsHelper(request.type, request.opt_host, request.callback);
     pending_origins_requests_.pop_front();
   }
   if (!pending_delete_requests_.empty()) {
     // Just start the first delete, others will follow upon completion.
     DeleteRequest request = pending_delete_requests_.front();
     pending_delete_requests_.pop_front();
     DeleteOriginData(request.origin, request.type, request.callback);
   }
 }
 
 void AppCacheQuotaClient::AbortPendingRequests() {
   while (!pending_usage_requests_.empty()) {
     pending_usage_requests_.front().callback->Run(0);
     delete pending_usage_requests_.front().callback;
     pending_usage_requests_.pop_front();
   }
   while (!pending_origins_requests_.empty()) {
-    pending_origins_requests_.front().callback->Run(std::set<GURL>());
+    pending_origins_requests_.front().callback->Run(std::set<GURL>(),
+        pending_origins_requests_.front().type);
     delete pending_origins_requests_.front().callback;
     pending_origins_requests_.pop_front();
   }
   while (!pending_delete_requests_.empty()) {
     pending_delete_requests_.front().callback->Run(quota::kQuotaErrorAbort);
     delete pending_delete_requests_.front().callback;
     pending_delete_requests_.pop_front();
   }
 }
 
@@ skipping 30 matching lines @@
     current_delete_request_callback_.reset();
     service_delete_callback_.release()->Cancel();
   } else {
     service_delete_callback_ = NULL;
   }
   if (quota_manager_is_destroyed_)
     delete this;
 }
 
 }  // namespace appcache