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

BUG=90996
TEST=test_shell_tests


Review URL: http://codereview.chromium.org/7533013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95591 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 6 deletions

diff --git a/webkit/appcache/appcache_quota_client.cc b/webkit/appcache/appcache_quota_client.cc
index 14bdb2b..db41d5e 100644
--- a/webkit/appcache/appcache_quota_client.cc
+++ b/webkit/appcache/appcache_quota_client.cc
@@ -103,7 +103,7 @@ void AppCacheQuotaClient::GetOriginsForHost(
     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;
   }
@@ -166,7 +166,7 @@ void AppCacheQuotaClient::GetOriginsHelper(
 
   scoped_ptr<GetOriginsCallback> callback(callback_ptr);
   if (!service_) {
-    callback->Run(std::set<GURL>());
+    callback->Run(std::set<GURL>(), type);
     return;
   }
 
@@ -179,7 +179,7 @@ void AppCacheQuotaClient::GetOriginsHelper(
   }
 
   if (type == quota::kStorageTypePersistent) {
-    callback->Run(std::set<GURL>());
+    callback->Run(std::set<GURL>(), type);
     return;
   }
 
@@ -190,7 +190,7 @@ void AppCacheQuotaClient::GetOriginsHelper(
     if (opt_host.empty() || iter->first.host() == opt_host)
       origins.insert(iter->first);
   }
-  callback->Run(origins);
+  callback->Run(origins, type);
 }
 
 void AppCacheQuotaClient::ProcessPendingRequests() {
@@ -220,7 +220,8 @@ void AppCacheQuotaClient::AbortPendingRequests() {
     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();
   }
diff --git a/webkit/appcache/appcache_quota_client_unittest.cc b/webkit/appcache/appcache_quota_client_unittest.cc
index 9ab1b4b..fb967ac 100644
--- a/webkit/appcache/appcache_quota_client_unittest.cc
+++ b/webkit/appcache/appcache_quota_client_unittest.cc
@@ -137,9 +137,11 @@ class AppCacheQuotaClientTest : public testing::Test {
     usage_ = usage;
   }
 
-  void OnGetOriginsComplete(const std::set<GURL>& origins) {
+  void OnGetOriginsComplete(const std::set<GURL>& origins,
+                            quota::StorageType type) {
     ++num_get_origins_completions_;
     origins_ = origins;
+    type_ = type;
   }
 
   void OnDeleteOriginDataComplete(quota::QuotaStatusCode status) {
@@ -149,6 +151,7 @@ class AppCacheQuotaClientTest : public testing::Test {
 
   int64 usage_;
   std::set<GURL> origins_;
+  quota::StorageType type_;
   quota::QuotaStatusCode delete_status_;
   int num_get_origin_usage_completions_;
   int num_get_origins_completions_;