Add an interface QuotaEvictionHandler.

webkit/quota/quota_manager.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_MANAGER_H_
 #define WEBKIT_QUOTA_QUOTA_MANAGER_H_
 #pragma once
 
 #include <deque>
 #include <list>
@@ skipping 16 matching lines @@
 class FilePath;
 
 namespace quota {
 
 class QuotaDatabase;
 class UsageTracker;
 
 struct QuotaManagerDeleter;
 class QuotaManagerProxy;
 
+// An interface called by QuotaTemporaryStorageEvictor.
+class QuotaEvictionHandler {
+ public:
+  typedef Callback1<GURL>::Type GetLRUOriginCallback;
+  typedef Callback4<QuotaStatusCode,
+                    int64 /* usage */,
+                    int64 /* quota */,
+                    int64 /* physical_avail */ >::Type DeleteOriginDataCallback;

[kinuko, 2011/05/16 13:57:44]

This callback being used for GetUsageAndQuotaForEviction might sound a bit
weird...

How about simply calling this EvictionCallback or something?  The callback seems
to be called when the next eviction is ready?

+
+  virtual void GetUsageAndQuotaForEviction(
+      DeleteOriginDataCallback* callback) = 0;
+
+  virtual void DeleteOriginData(
+      const GURL& origin,
+      StorageType type,
+      DeleteOriginDataCallback* callback) = 0;
+
+  virtual void GetLRUOrigin(
+      StorageType type,
+      GetLRUOriginCallback* callback) = 0;
+};
+
 // The quota manager class.  This class is instantiated per profile and
 // held by the profile.  With the exception of the constructor and the
 // proxy() method, all methods should only be called on the IO thread.
 class QuotaManager : public QuotaTaskObserver,
+                     public QuotaEvictionHandler,
                      public base::RefCountedThreadSafe<
                          QuotaManager, QuotaManagerDeleter> {
  public:
   typedef Callback3<QuotaStatusCode,
                     int64 /* usage */,
                     int64 /* quota */>::Type GetUsageAndQuotaCallback;
   typedef Callback2<QuotaStatusCode,
                     int64 /* granted_quota */>::Type RequestQuotaCallback;
   typedef Callback1<GURL>::Type GetLRUOriginCallback;
 
@@ skipping 84 matching lines @@
   // when the first quota manager API is called.
   // Initialize must be called after all quota clients are added to the
   // manager by RegisterStorage.
   void LazyInitialize();
 
   // Called by clients via proxy.
   // Registers a quota client to the manager.
   // The client must remain valid until OnQuotaManagerDestored is called.
   void RegisterClient(QuotaClient* client);
 
-  // TODO(dmikurube): Add a test for this method.
   virtual void GetLRUOrigin(
       StorageType type,
-      GetLRUOriginCallback* callback);
+      GetLRUOriginCallback* callback) OVERRIDE;
+

[kinuko, 2011/05/16 13:57:44]

style-nit: no empty lines between OVERRIDE methods

+  virtual void GetUsageAndQuotaForEviction(
+      DeleteOriginDataCallback* callback) OVERRIDE;
+
+  virtual void DeleteOriginData(
+      const GURL& origin,
+      StorageType type,
+      DeleteOriginDataCallback* callback) OVERRIDE;
 
   UsageTracker* GetUsageTracker(StorageType type) const;
 
   void DidGetTemporaryGlobalQuota(int64 quota);
 
   void DeleteOnCorrectThread() const;
 
   const bool is_incognito_;
   const FilePath profile_path_;
 
@@ skipping 55 matching lines @@
   QuotaManager* manager_;  // only accessed on the io thread
   scoped_refptr<base::MessageLoopProxy> io_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(QuotaManagerProxy);
 };
 
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_QUOTA_MANAGER_H_