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

webkit/quota/mock_storage_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/quota/mock_storage_client.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
@@ skipping 145 matching lines @@
 void MockStorageClient::RunGetOriginsForType(
     StorageType type, GetOriginsCallback* callback_ptr) {
   scoped_ptr<GetOriginsCallback> callback(callback_ptr);
   origins_callbacks_.erase(callback_ptr);
   std::set<GURL> origins;
   for (OriginDataMap::iterator iter = origin_data_.begin();
        iter != origin_data_.end(); ++iter) {
     if (type == iter->first.second)
       origins.insert(iter->first.first);
   }
-  callback->Run(origins);
+  callback->Run(origins, type);
 }
 
 void MockStorageClient::RunGetOriginsForHost(
     StorageType type, const std::string& host,
     GetOriginsCallback* callback_ptr) {
   scoped_ptr<GetOriginsCallback> callback(callback_ptr);
   origins_callbacks_.erase(callback_ptr);
   std::set<GURL> origins;
   for (OriginDataMap::iterator iter = origin_data_.begin();
        iter != origin_data_.end(); ++iter) {
     std::string host_or_spec = net::GetHostOrSpecFromURL(iter->first.first);
     if (type == iter->first.second && host == host_or_spec)
       origins.insert(iter->first.first);
   }
-  callback->Run(origins);
+  callback->Run(origins, type);
 }
 
 void MockStorageClient::RunDeleteOriginData(
     const GURL& origin_url,
     StorageType type,
     DeletionCallback* callback_ptr) {
   scoped_ptr<DeletionCallback> callback(callback_ptr);
   ErrorOriginSet::iterator itr_error =
       error_origins_.find(make_pair(origin_url, type));
   if (itr_error != error_origins_.end()) {
     deletion_callbacks_.erase(callback_ptr);
     callback->Run(kQuotaErrorInvalidModification);
     return;
   }
 
   OriginDataMap::iterator itr =
       origin_data_.find(make_pair(origin_url, type));
   if (itr != origin_data_.end()) {
     int64 delta = itr->second;
     quota_manager_proxy_->
         NotifyStorageModified(id(), origin_url, type, -delta);
     origin_data_.erase(itr);
   }
 
   deletion_callbacks_.erase(callback_ptr);
   callback->Run(kQuotaStatusOk);
 }
 
 }  // namespace quota