Merged HostQuotaCallback into QuotaCallback

webkit/quota/quota_types.h

Index: webkit/quota/quota_types.h
diff --git a/webkit/quota/quota_types.h b/webkit/quota/quota_types.h
index aab070e350c64a9555bfaa556a7885e151408086..cd2e0d0f3074d7e9995d58347dad49b4dfc75393 100644
--- a/webkit/quota/quota_types.h
+++ b/webkit/quota/quota_types.h
@@ -43,13 +43,8 @@ typedef std::vector<UsageInfo> UsageInfoEntries;
 typedef base::Callback<void(StorageType status,
                             int64 usage,
                             int64 unlimited_usage)> GlobalUsageCallback;
-typedef base::Callback<void(QuotaStatusCode status,
-                            StorageType type,
-                            int64 quota)> QuotaCallback;
+typedef base::Callback<void(QuotaStatusCode status, int64 quota)> QuotaCallback;
 typedef base::Callback<void(int64 usage)> UsageCallback;
-// TODO(calvinlo): Merge HostQuotaCallback and QuotaCallback
-typedef base::Callback<void(QuotaStatusCode status,
-                            int64 quota)> HostQuotaCallback;
 typedef base::Callback<void(QuotaStatusCode, int64)> AvailableSpaceCallback;
 typedef base::Callback<void(QuotaStatusCode)> StatusCallback;
 typedef base::Callback<void(const std::set<GURL>& origins,