Implement GetUsageAndQuotaForEviction in QuotaManager.

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 136 matching lines @@
   class PersistentHostQuotaQueryTask;
   class GetLRUOriginTask;
   class OriginDeletionDatabaseTask;
 
   class UsageAndQuotaDispatcherTask;
   class UsageAndQuotaDispatcherTaskForTemporary;
   class UsageAndQuotaDispatcherTaskForPersistent;
 
   class AvailableSpaceQueryTask;
 
+  struct GetUsageAndQuotaForEvictionMembers {

[kinuko, 2011/05/18 09:08:01]

Can we just move all the eviction-related member variables into one class (once
the other patch is submitted) and call this struct EvictionStatus or something
simpler?

[Dai Mikurube (NOT FULLTIME), 2011/05/18 09:31:30]

Renamed it to EvictionContext.  (EvictOriginData-related members are not
included yet.  They're not landed.)

+    GetUsageAndQuotaForEvictionMembers(int64 usage, int64 quota)

[kinuko, 2011/05/18 09:08:01]

Do we want to pass any particular values here?  I imagined we could just set
all-zero here.

[Dai Mikurube (NOT FULLTIME), 2011/05/18 09:31:30]

Done.

+        : usage_(usage),
+          quota_(quota) {
+    }
+
+    scoped_ptr<GetUsageAndQuotaForEvictionCallback> callback_;
+    int64 usage_;
+    int64 quota_;

[kinuko, 2011/05/18 09:08:01]

public struct members do not need to have trailing _.

[Dai Mikurube (NOT FULLTIME), 2011/05/18 09:31:30]

Done.

+  };
+
   typedef std::pair<std::string, StorageType> HostAndType;
   typedef std::map<HostAndType, UsageAndQuotaDispatcherTask*>
       UsageAndQuotaDispatcherTaskMap;
 
   friend struct QuotaManagerDeleter;
   friend class QuotaManagerProxy;
+  friend class QuotaManagerTest;
 
   // This initialization method is lazily called on the IO thread
   // 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);
 
   UsageTracker* GetUsageTracker(StorageType type) const;
 
   void DidGetTemporaryGlobalQuota(int64 quota);
 
   // Methods for eviction logic.
   void DeleteOriginFromDatabase(const GURL& origin, StorageType type);
 
+  void OnGetAvailableSpaceForEviction(

[kinuko, 2011/05/18 09:08:01]

Could we rename OnXxx -> DidXxx on those methods too?

[Dai Mikurube (NOT FULLTIME), 2011/05/18 09:31:30]

Done.

+      QuotaStatusCode status,
+      int64 available_space);
+  void OnGetGlobalQuotaForEviction(
+      QuotaStatusCode status,
+      int64 quota);
+  void OnGetGlobalUsageForEviction(int64 usage);
+
   virtual void GetLRUOrigin(
       StorageType type,
       GetLRUOriginCallback* callback) OVERRIDE;
   virtual void EvictOriginData(
       const GURL& origin,
       StorageType type,
       EvictOriginDataCallback* callback) OVERRIDE;
   virtual void GetUsageAndQuotaForEviction(
       GetUsageAndQuotaForEvictionCallback* callback) OVERRIDE;
 
   void DeleteOnCorrectThread() const;
 
   const bool is_incognito_;
   const FilePath profile_path_;
 
   scoped_refptr<QuotaManagerProxy> proxy_;
   bool db_disabled_;
   scoped_refptr<base::MessageLoopProxy> io_thread_;
   scoped_refptr<base::MessageLoopProxy> db_thread_;
   mutable scoped_ptr<QuotaDatabase> database_;
 
   QuotaClientList clients_;
 
   scoped_ptr<UsageTracker> temporary_usage_tracker_;
   scoped_ptr<UsageTracker> persistent_usage_tracker_;
 
+  GetUsageAndQuotaForEvictionMembers get_usage_and_quota_for_eviction_members_;
+
   UsageAndQuotaDispatcherTaskMap usage_and_quota_dispatchers_;
 
   int64 temporary_global_quota_;
   QuotaCallbackQueue temporary_global_quota_callbacks_;
 
   // Map from origin to count.
   std::map<GURL, int> origins_in_use_;
 
+  base::ScopedCallbackFactory<QuotaManager> callback_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(QuotaManager);
 };
 
 struct QuotaManagerDeleter {
   static void Destruct(const QuotaManager* manager) {
     manager->DeleteOnCorrectThread();
   }
 };
 
 // The proxy may be called and finally released on any thread.
@@ skipping 25 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_