Index: storage/browser/quota/usage_tracker.h |
diff --git a/webkit/browser/quota/usage_tracker.h b/storage/browser/quota/usage_tracker.h |
similarity index 89% |
rename from webkit/browser/quota/usage_tracker.h |
rename to storage/browser/quota/usage_tracker.h |
index 91bd18c5f88cac894bb13f7d42f8ab4095dad5ac..c7831568681c50bc55b7aeddee27becf976af10a 100644 |
--- a/webkit/browser/quota/usage_tracker.h |
+++ b/storage/browser/quota/usage_tracker.h |
@@ -15,12 +15,12 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/threading/non_thread_safe.h" |
#include "url/gurl.h" |
-#include "webkit/browser/quota/quota_callbacks.h" |
-#include "webkit/browser/quota/quota_client.h" |
-#include "webkit/browser/quota/quota_task.h" |
-#include "webkit/browser/quota/special_storage_policy.h" |
-#include "webkit/browser/webkit_storage_browser_export.h" |
-#include "webkit/common/quota/quota_types.h" |
+#include "storage/browser/quota/quota_callbacks.h" |
+#include "storage/browser/quota/quota_client.h" |
+#include "storage/browser/quota/quota_task.h" |
+#include "storage/browser/quota/special_storage_policy.h" |
+#include "storage/common/storage_export.h" |
+#include "storage/common/quota/quota_types.h" |
namespace quota { |
@@ -30,9 +30,10 @@ class StorageMonitor; |
// A helper class that gathers and tracks the amount of data stored in |
// all quota clients. |
// An instance of this class is created per storage type. |
-class WEBKIT_STORAGE_BROWSER_EXPORT UsageTracker : public QuotaTaskObserver { |
+class STORAGE_EXPORT UsageTracker : public QuotaTaskObserver { |
public: |
- UsageTracker(const QuotaClientList& clients, StorageType type, |
+ UsageTracker(const QuotaClientList& clients, |
+ StorageType type, |
SpecialStoragePolicy* special_storage_policy, |
StorageMonitor* storage_monitor); |
virtual ~UsageTracker(); |
@@ -96,10 +97,10 @@ class ClientUsageTracker : public SpecialStoragePolicy::Observer, |
public base::NonThreadSafe, |
public base::SupportsWeakPtr<ClientUsageTracker> { |
public: |
- typedef base::Callback<void(int64 limited_usage, |
- int64 unlimited_usage)> HostUsageAccumulator; |
- typedef base::Callback<void(const GURL& origin, |
- int64 usage)> OriginUsageAccumulator; |
+ typedef base::Callback<void(int64 limited_usage, int64 unlimited_usage)> |
+ HostUsageAccumulator; |
+ typedef base::Callback<void(const GURL& origin, int64 usage)> |
+ OriginUsageAccumulator; |
typedef std::map<std::string, std::set<GURL> > OriginSetByHost; |
ClientUsageTracker(UsageTracker* tracker, |
@@ -121,7 +122,8 @@ class ClientUsageTracker : public SpecialStoragePolicy::Observer, |
void SetUsageCacheEnabled(const GURL& origin, bool enabled); |
private: |
- typedef CallbackQueueMap<HostUsageAccumulator, std::string, |
+ typedef CallbackQueueMap<HostUsageAccumulator, |
+ std::string, |
Tuple2<int64, int64> > HostUsageAccumulatorMap; |
typedef std::set<std::string> HostSet; |
@@ -133,8 +135,7 @@ class ClientUsageTracker : public SpecialStoragePolicy::Observer, |
int64 limited_usage; |
int64 unlimited_usage; |
- AccumulateInfo() |
- : pending_jobs(0), limited_usage(0), unlimited_usage(0) {} |
+ AccumulateInfo() : pending_jobs(0), limited_usage(0), unlimited_usage(0) {} |
}; |
void AccumulateLimitedOriginUsage(AccumulateInfo* info, |