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

webkit/quota/quota_client.h

 // 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.
 
 #ifndef WEBKIT_QUOTA_QUOTA_CLIENT_H_
 #define WEBKIT_QUOTA_QUOTA_CLIENT_H_
 
 #include <list>
 #include <set>
 #include <string>
 
 #include "base/callback_old.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/quota/quota_types.h"
 
 namespace quota {
 
 // An abstract interface for quota manager clients.
 // Each storage API must provide an implementation of this interface and
 // register it to the quota manager.
 // All the methods are assumed to be called on the IO thread in the browser.
 class QuotaClient {
  public:
   typedef Callback1<int64>::Type GetUsageCallback;
-  typedef Callback1<const std::set<GURL>&>::Type GetOriginsCallback;
+  typedef Callback2<const std::set<GURL>&, StorageType>::Type
+      GetOriginsCallback;
   typedef Callback1<QuotaStatusCode>::Type DeletionCallback;
 
   virtual ~QuotaClient() {}
 
   enum ID {
     kUnknown,
     kFileSystem,
     kDatabase,
     kAppcache,
     kIndexedDatabase,
@@ skipping 14 matching lines @@
 
   // Called by the QuotaManager.
   // Returns a list of origins that has data in the |type| storage.
   virtual void GetOriginsForType(StorageType type,
                                  GetOriginsCallback* callback) = 0;
 
   // Called by the QuotaManager.
   // Returns a list of origins that match the |host|.
   virtual void GetOriginsForHost(StorageType type,
                                  const std::string& host,
                                  GetOriginsCallback* callback) = 0;

[kinuko, 2011/07/29 11:12:37]

For this one it might look a bit strange to have only set<GURL> and type as
callback parameters while we get origins for given {type,host}.  (While
returning type sounds reasonable for other methods that take GetOriginsCallback,
i.e. GetOriginsForType and GetOriginsModifiedSince).

Alternatively you could make this change local to GetOriginsModifiedSince by
defining a new callback type that is only used by the method.

[kinuko, 2011/07/29 12:13:16]

As we chatted offline, on the second thought it might be ok not to have host for
this method either, since basically the host info is contained in the origin. 
So... I think the patch as is looks good to me.

 
   // Called by the QuotaManager.
   virtual void DeleteOriginData(const GURL& origin,
                                 StorageType type,
                                 DeletionCallback* callback) = 0;
 };
 
 // TODO(dmikurube): Replace it to std::vector for efficiency.
 typedef std::list<QuotaClient*> QuotaClientList;
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_QUOTA_CLIENT_H_