[Quota][Clean up] Drop non-informative StorageType parameter on GetOriginsForType callback

The caller of GetOriginsForType should know the StorageType,
so this parameter will not add any information to the callback.
Historically this was useful when we'd used old callbacks.

BUG=220029
TEST=should not break existing tests

Review URL: https://chromiumcodereview.appspot.com/15925005

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

content/browser/indexed_db/indexed_db_quota_client.cc

@@ -43,10 +43,9 @@ void GetAllOriginsOnWebKitThread(
 
 void DidGetOrigins(
     const IndexedDBQuotaClient::GetOriginsCallback& callback,
-    const std::set<GURL>* origins,
-    quota::StorageType storage_type) {
+    const std::set<GURL>* origins) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  callback.Run(*origins, storage_type);
+  callback.Run(*origins);
 }
 
 void GetOriginsForHostOnWebKitThread(
@@ -114,7 +113,7 @@ void IndexedDBQuotaClient::GetOriginsForType(
 
   // All databases are in the temp namespace for now.
   if (type != quota::kStorageTypeTemporary) {
-    callback.Run(std::set<GURL>(), type);
+    callback.Run(std::set<GURL>());
     return;
   }
 
@@ -126,8 +125,7 @@ void IndexedDBQuotaClient::GetOriginsForType(
                  base::Unretained(origins_to_return)),
       base::Bind(&DidGetOrigins,
                  callback,
-                 base::Owned(origins_to_return),
-                 type));
+                 base::Owned(origins_to_return)));
 }
 
 void IndexedDBQuotaClient::GetOriginsForHost(
@@ -139,7 +137,7 @@ void IndexedDBQuotaClient::GetOriginsForHost(
 
   // All databases are in the temp namespace for now.
   if (type != quota::kStorageTypeTemporary) {
-    callback.Run(std::set<GURL>(), type);
+    callback.Run(std::set<GURL>());
     return;
   }
 
@@ -152,8 +150,7 @@ void IndexedDBQuotaClient::GetOriginsForHost(
                  base::Unretained(origins_to_return)),
       base::Bind(&DidGetOrigins,
                  callback,
-                 base::Owned(origins_to_return),
-                 type));
+                 base::Owned(origins_to_return)));
 }
 
 void IndexedDBQuotaClient::DeleteOriginData(

content/browser/indexed_db/indexed_db_quota_client_unittest.cc

@@ -89,7 +89,6 @@ class IndexedDBQuotaClientTest : public testing::Test {
       quota::QuotaClient* client,
       quota::StorageType type) {
     origins_.clear();
-    type_ = quota::kStorageTypeTemporary;
     client->GetOriginsForType(
         type,
         base::Bind(&IndexedDBQuotaClientTest::OnGetOriginsComplete,
@@ -103,7 +102,6 @@ class IndexedDBQuotaClientTest : public testing::Test {
       quota::StorageType type,
       const std::string& host) {
     origins_.clear();
-    type_ = quota::kStorageTypeTemporary;
     client->GetOriginsForHost(
         type, host,
         base::Bind(&IndexedDBQuotaClientTest::OnGetOriginsComplete,
@@ -147,10 +145,8 @@ class IndexedDBQuotaClientTest : public testing::Test {
     usage_ = usage;
   }
 
-  void OnGetOriginsComplete(const std::set<GURL>& origins,
-      quota::StorageType type) {
+  void OnGetOriginsComplete(const std::set<GURL>& origins) {
     origins_ = origins;
-    type_ = type;
   }
 
   void OnDeleteOriginComplete(quota::QuotaStatusCode code) {
@@ -160,7 +156,6 @@ class IndexedDBQuotaClientTest : public testing::Test {
   base::ScopedTempDir temp_dir_;
   int64 usage_;
   std::set<GURL> origins_;
-  quota::StorageType type_;
   scoped_refptr<IndexedDBContextImpl> idb_context_;
   base::WeakPtrFactory<IndexedDBQuotaClientTest> weak_factory_;
   base::MessageLoop message_loop_;

webkit/appcache/appcache_quota_client.cc

@@ -106,7 +106,7 @@ void AppCacheQuotaClient::GetOriginsForHost(
     const GetOriginsCallback& callback) {
   DCHECK(!callback.is_null());
   if (host.empty()) {
-    callback.Run(std::set<GURL>(), type);
+    callback.Run(std::set<GURL>());
     return;
   }
   GetOriginsHelper(type, host, callback);
@@ -162,7 +162,7 @@ void AppCacheQuotaClient::GetOriginsHelper(
   DCHECK(!quota_manager_is_destroyed_);
 
   if (!service_) {
-    callback.Run(std::set<GURL>(), type);
+    callback.Run(std::set<GURL>());
     return;
   }
 
@@ -174,7 +174,7 @@ void AppCacheQuotaClient::GetOriginsHelper(
   }
 
   if (type != quota::kStorageTypeTemporary) {
-    callback.Run(std::set<GURL>(), type);
+    callback.Run(std::set<GURL>());
     return;
   }
 
@@ -185,7 +185,7 @@ void AppCacheQuotaClient::GetOriginsHelper(
     if (opt_host.empty() || iter->first.host() == opt_host)
       origins.insert(iter->first);
   }
-  callback.Run(origins, type);
+  callback.Run(origins);
 }
 
 void AppCacheQuotaClient::ProcessPendingRequests() {

webkit/appcache/appcache_quota_client_unittest.cc

@@ -142,11 +142,9 @@ class AppCacheQuotaClientTest : public testing::Test {
     usage_ = usage;
   }
 
-  void OnGetOriginsComplete(const std::set<GURL>& origins,
-                            quota::StorageType type) {
+  void OnGetOriginsComplete(const std::set<GURL>& origins) {
     ++num_get_origins_completions_;
     origins_ = origins;
-    type_ = type;
   }
 
   void OnDeleteOriginDataComplete(quota::QuotaStatusCode status) {
@@ -157,7 +155,6 @@ class AppCacheQuotaClientTest : public testing::Test {
   base::MessageLoop message_loop_;
   int64 usage_;
   std::set<GURL> origins_;
-  quota::StorageType type_;
   quota::QuotaStatusCode delete_status_;
   int num_get_origin_usage_completions_;
   int num_get_origins_completions_;

webkit/browser/database/database_quota_client.cc

@@ -66,9 +66,8 @@ void GetOriginsForHostOnDBThread(
 
 void DidGetOrigins(
     const QuotaClient::GetOriginsCallback& callback,
-    std::set<GURL>* origins_ptr,
-    quota::StorageType type) {
-  callback.Run(*origins_ptr, type);
+    std::set<GURL>* origins_ptr) {
+  callback.Run(*origins_ptr);
 }
 
 void DidDeleteOriginData(
@@ -151,7 +150,7 @@ void DatabaseQuotaClient::GetOriginsForType(
 
   // All databases are in the temp namespace for now.
   if (type != quota::kStorageTypeTemporary) {
-    callback.Run(std::set<GURL>(), type);
+    callback.Run(std::set<GURL>());
     return;
   }
 
@@ -163,8 +162,7 @@ void DatabaseQuotaClient::GetOriginsForType(
                  base::Unretained(origins_ptr)),
       base::Bind(&DidGetOrigins,
                  callback,
-                 base::Owned(origins_ptr),
-                 type));
+                 base::Owned(origins_ptr)));
 }
 
 void DatabaseQuotaClient::GetOriginsForHost(
@@ -176,7 +174,7 @@ void DatabaseQuotaClient::GetOriginsForHost(
 
   // All databases are in the temp namespace for now.
   if (type != quota::kStorageTypeTemporary) {
-    callback.Run(std::set<GURL>(), type);
+    callback.Run(std::set<GURL>());
     return;
   }
 
@@ -189,8 +187,7 @@ void DatabaseQuotaClient::GetOriginsForHost(
                  host),
       base::Bind(&DidGetOrigins,
                  callback,
-                 base::Owned(origins_ptr),
-                 type));
+                 base::Owned(origins_ptr)));
 }
 
 void DatabaseQuotaClient::DeleteOriginData(

webkit/browser/database/database_quota_client_unittest.cc

@@ -192,10 +192,8 @@ class DatabaseQuotaClientTest : public testing::Test {
     usage_ = usage;
   }
 
-  void OnGetOriginsComplete(const std::set<GURL>& origins,
-      quota::StorageType type) {
+  void OnGetOriginsComplete(const std::set<GURL>& origins) {
     origins_ = origins;
-    type_ = type;
   }
 
   void OnDeleteOriginDataComplete(quota::QuotaStatusCode status) {
@@ -205,7 +203,6 @@ class DatabaseQuotaClientTest : public testing::Test {
   base::MessageLoop message_loop_;
   int64 usage_;
   std::set<GURL> origins_;
-  quota::StorageType type_;
   quota::QuotaStatusCode delete_status_;
   scoped_refptr<MockDatabaseTracker> mock_tracker_;
   base::WeakPtrFactory<DatabaseQuotaClientTest> weak_factory_;

webkit/browser/fileapi/file_system_quota_client.cc

@@ -60,9 +60,8 @@ void GetOriginsForHostOnFileThread(
 
 void DidGetOrigins(
     const quota::QuotaClient::GetOriginsCallback& callback,
-    std::set<GURL>* origins_ptr,
-    StorageType storage_type) {
-  callback.Run(*origins_ptr, storage_type);
+    std::set<GURL>* origins_ptr) {
+  callback.Run(*origins_ptr);
 }
 
 quota::QuotaStatusCode DeleteOriginOnFileThread(
@@ -137,7 +136,7 @@ void FileSystemQuotaClient::GetOriginsForType(
   if (is_incognito_) {
     // We don't support FileSystem in incognito mode yet.
     std::set<GURL> origins;
-    callback.Run(origins, storage_type);
+    callback.Run(origins);
     return;
   }
 
@@ -150,8 +149,7 @@ void FileSystemQuotaClient::GetOriginsForType(
                  base::Unretained(origins_ptr)),
       base::Bind(&DidGetOrigins,
                  callback,
-                 base::Owned(origins_ptr),
-                 storage_type));
+                 base::Owned(origins_ptr)));
 }
 
 void FileSystemQuotaClient::GetOriginsForHost(
@@ -163,7 +161,7 @@ void FileSystemQuotaClient::GetOriginsForHost(
   if (is_incognito_) {
     // We don't support FileSystem in incognito mode yet.
     std::set<GURL> origins;
-    callback.Run(origins, storage_type);
+    callback.Run(origins);
     return;
   }
 
@@ -177,8 +175,7 @@ void FileSystemQuotaClient::GetOriginsForHost(
                  base::Unretained(origins_ptr)),
       base::Bind(&DidGetOrigins,
                  callback,
-                 base::Owned(origins_ptr),
-                 storage_type));
+                 base::Owned(origins_ptr)));
 }
 
 void FileSystemQuotaClient::DeleteOriginData(

webkit/browser/fileapi/file_system_quota_client_unittest.cc

@@ -234,10 +234,8 @@ class FileSystemQuotaClientTest : public testing::Test {
     usage_ = usage;
   }
 
-  void OnGetOrigins(const std::set<GURL>& origins,
-      quota::StorageType type) {
+  void OnGetOrigins(const std::set<GURL>& origins) {
     origins_ = origins;
-    type_ = type;
   }
 
   void OnGetAdditionalUsage(int64 usage_unused) {
@@ -255,7 +253,6 @@ class FileSystemQuotaClientTest : public testing::Test {
   int64 usage_;
   int additional_callback_count_;
   std::set<GURL> origins_;
-  quota::StorageType type_;
   quota::QuotaStatusCode deletion_status_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemQuotaClientTest);

webkit/quota/mock_storage_client.cc

@@ -140,7 +140,7 @@ void MockStorageClient::RunGetOriginsForType(
     if (type == iter->first.second)
       origins.insert(iter->first.first);
   }
-  callback.Run(origins, type);
+  callback.Run(origins);
 }
 
 void MockStorageClient::RunGetOriginsForHost(
@@ -153,7 +153,7 @@ void MockStorageClient::RunGetOriginsForHost(
     if (type == iter->first.second && host == host_or_spec)
       origins.insert(iter->first.first);
   }
-  callback.Run(origins, type);
+  callback.Run(origins);
 }
 
 void MockStorageClient::RunDeleteOriginData(

webkit/quota/quota_client.h

@@ -22,10 +22,10 @@ namespace quota {
 // All the methods are assumed to be called on the IO thread in the browser.
 class WEBKIT_STORAGE_EXPORT QuotaClient {
  public:
-  typedef base::Callback<void(int64)> GetUsageCallback;  // NOLINT
-  typedef base::Callback<void(const std::set<GURL>&, StorageType)>
+  typedef base::Callback<void(int64 usage)> GetUsageCallback;
+  typedef base::Callback<void(const std::set<GURL>& origins)>
       GetOriginsCallback;
-  typedef base::Callback<void(QuotaStatusCode)> DeletionCallback;
+  typedef base::Callback<void(QuotaStatusCode status)> DeletionCallback;
 
   virtual ~QuotaClient() {}
 

webkit/quota/quota_manager.cc

@@ -642,7 +642,7 @@ class QuotaManager::HostDataDeleter : public QuotaTask {
     DeleteSoon();
   }
 
-  void DidGetOriginsForHost(const std::set<GURL>& origins, StorageType type) {
+  void DidGetOriginsForHost(const std::set<GURL>& origins) {
     DCHECK_GT(remaining_clients_, 0);
 
     origins_.insert(origins.begin(), origins.end());

webkit/quota/usage_tracker.cc

@@ -364,7 +364,7 @@ void ClientUsageTracker::SetUsageCacheEnabled(const GURL& origin,
 
 void ClientUsageTracker::DidGetOriginsForGlobalUsage(
     const GlobalUsageCallback& callback,
-    const std::set<GURL>& origins, StorageType type) {
+    const std::set<GURL>& origins) {
   OriginSetByHost origins_by_host;
   for (std::set<GURL>::const_iterator itr = origins.begin();
        itr != origins.end(); ++itr)
@@ -415,8 +415,7 @@ void ClientUsageTracker::AccumulateHostUsage(
 
 void ClientUsageTracker::DidGetOriginsForHostUsage(
     const std::string& host,
-    const std::set<GURL>& origins,
-    StorageType type) {
+    const std::set<GURL>& origins) {
   GetUsageForOrigins(host, origins);
 }
 

webkit/quota/usage_tracker.h

@@ -127,16 +127,14 @@ class ClientUsageTracker : public SpecialStoragePolicy::Observer,
   };
 
   void DidGetOriginsForGlobalUsage(const GlobalUsageCallback& callback,
-                                   const std::set<GURL>& origins,
-                                   StorageType type);
+                                   const std::set<GURL>& origins);
   void AccumulateHostUsage(AccumulateInfo* info,
                            const GlobalUsageCallback& callback,
                            int64 cached_usage,
                            int64 non_cached_usage);
 
   void DidGetOriginsForHostUsage(const std::string& host,
-                                 const std::set<GURL>& origins,
-                                 StorageType type);
+                                 const std::set<GURL>& origins);
 
   void GetUsageForOrigins(const std::string& host,
                           const std::set<GURL>& origins);

webkit/quota/usage_tracker_unittest.cc

@@ -63,7 +63,7 @@ class MockQuotaClient : public QuotaClient {
       origins.insert(itr->first);
     }
     base::MessageLoop::current()->PostTask(FROM_HERE,
-                                           base::Bind(callback, origins, type));
+                                           base::Bind(callback, origins));
   }
 
   virtual void GetOriginsForHost(StorageType type,
@@ -77,7 +77,7 @@ class MockQuotaClient : public QuotaClient {
         origins.insert(itr->first);
     }
     base::MessageLoop::current()->PostTask(FROM_HERE,
-                                           base::Bind(callback, origins, type));
+                                           base::Bind(callback, origins));
   }
 
   virtual void DeleteOriginData(const GURL& origin,