Retrieve per host storage usage from QuotaManager.

webkit/quota/usage_tracker.cc

Index: webkit/quota/usage_tracker.cc
diff --git a/webkit/quota/usage_tracker.cc b/webkit/quota/usage_tracker.cc
index 60abf85f954f92e130473d11a4b4785e9ad2fd4d..53a733b1d92a16cedf9b5572d879cd8c10b5ac0a 100644
--- a/webkit/quota/usage_tracker.cc
+++ b/webkit/quota/usage_tracker.cc
@@ -272,6 +272,16 @@ void UsageTracker::UpdateUsageCache(
   client_tracker->UpdateUsageCache(origin, delta);
 }
 
+void UsageTracker::GetCachedHostsUsage(
+    std::map<std::string, int64>* host_usage) const {
+  DCHECK(host_usage);
+  host_usage->clear();
+  for (ClientTrackerMap::const_iterator iter = client_tracker_map_.begin();
+       iter != client_tracker_map_.end(); ++iter) {
+    iter->second->GetCachedHostsUsage(host_usage);
+  }
+}
+
 void UsageTracker::GetCachedOrigins(std::set<GURL>* origins) const {
   DCHECK(origins);
   origins->clear();
@@ -393,6 +403,16 @@ void ClientUsageTracker::UpdateUsageCache(
                NewCallback(this, &ClientUsageTracker::NoopHostUsageCallback));
 }
 
+void ClientUsageTracker::GetCachedHostsUsage(
+    std::map<std::string, int64>* host_usage) const {
+  DCHECK(host_usage);
+  for (HostUsageMap::const_iterator host_iter = cached_usage_.begin();
+       host_iter != cached_usage_.end(); host_iter++) {
+    host_usage->operator[](host_iter->first) +=
+        GetCachedHostUsage(host_iter->first);

[tzik, 2013/05/24 12:03:29]

I'm cleaning up around UsageTracker now.
Was there any reason to avoid (*host_usage)[host_itr->first]?

If no, I'll replace this.

[mnaganov (inactive), 2013/05/24 12:06:58]

I just didn't think about this possibility then. Please replace.

+  }
+}
+
 void ClientUsageTracker::GetCachedOrigins(std::set<GURL>* origins) const {
   DCHECK(origins);
   for (HostUsageMap::const_iterator host_iter = cached_usage_.begin();
@@ -449,7 +469,7 @@ void ClientUsageTracker::GatherHostUsageComplete(const std::string& host) {
   host_usage_callbacks_.Run(host, host, type_, GetCachedHostUsage(host));
 }
 
-int64 ClientUsageTracker::GetCachedHostUsage(const std::string& host) {
+int64 ClientUsageTracker::GetCachedHostUsage(const std::string& host) const {
   HostUsageMap::const_iterator found = cached_usage_.find(host);
   if (found == cached_usage_.end())
     return 0;