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

webkit/fileapi/file_system_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/fileapi/file_system_quota_client.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/file_path.h"
@@ skipping 202 matching lines @@
   }
 }
 
 void FileSystemQuotaClient::GetOriginsForType(
     StorageType storage_type,
     GetOriginsCallback* callback_ptr) {
   std::set<GURL> origins;
   scoped_ptr<GetOriginsCallback> callback(callback_ptr);
   if (is_incognito_) {
     // We don't support FileSystem in incognito mode yet.
-    callback->Run(origins);
+    callback->Run(origins, storage_type);
     return;
   }
 
   FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
   DCHECK(type != kFileSystemTypeUnknown);
 
   if (pending_origins_for_type_callbacks_.Add(type, callback.release())) {
     scoped_refptr<GetOriginsForTypeTask> task(
         new GetOriginsForTypeTask(this, file_message_loop_, type));
     task->Start();
   }
 }
 
 void FileSystemQuotaClient::GetOriginsForHost(
     StorageType storage_type,
     const std::string& host,
     GetOriginsCallback* callback_ptr) {
   std::set<GURL> origins;
   scoped_ptr<GetOriginsCallback> callback(callback_ptr);
   if (is_incognito_) {
     // We don't support FileSystem in incognito mode yet.
-    callback->Run(origins);
+    callback->Run(origins, storage_type);
     return;
   }
 
   FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
   DCHECK(type != kFileSystemTypeUnknown);
 
   if (pending_origins_for_host_callbacks_.Add(
           std::make_pair(type, host), callback.release())) {
     scoped_refptr<GetOriginsForHostTask> task(
         new GetOriginsForHostTask(this, file_message_loop_,
@@ skipping 17 matching lines @@
     FileSystemType type, const GURL& origin_url, int64 usage) {
   TypeAndHostOrOrigin type_and_origin(std::make_pair(
       type, origin_url.spec()));
   DCHECK(pending_usage_callbacks_.HasCallbacks(type_and_origin));
   pending_usage_callbacks_.Run(type_and_origin, usage);
 }
 
 void FileSystemQuotaClient::DidGetOriginsForType(
     FileSystemType type, const std::set<GURL>& origins) {
   DCHECK(pending_origins_for_type_callbacks_.HasCallbacks(type));
-  pending_origins_for_type_callbacks_.Run(type, origins);
+  pending_origins_for_type_callbacks_.Run(type, origins,
+      FileSystemTypeToQuotaStorageType(type));
 }
 
 void FileSystemQuotaClient::DidGetOriginsForHost(
     const TypeAndHostOrOrigin& type_and_host, const std::set<GURL>& origins) {
   DCHECK(pending_origins_for_host_callbacks_.HasCallbacks(type_and_host));
-  pending_origins_for_host_callbacks_.Run(type_and_host, origins);
+  pending_origins_for_host_callbacks_.Run(type_and_host, origins,
+      FileSystemTypeToQuotaStorageType(type_and_host.first));
 }
 
 }  // namespace fileapi