[DevTools] Make generated protocol structs wrappers around DictionaryValue

content/browser/devtools/protocol/usage_and_quota_query.h

Index: content/browser/devtools/protocol/usage_and_quota_query.h
diff --git a/content/browser/devtools/protocol/usage_and_quota_query.h b/content/browser/devtools/protocol/usage_and_quota_query.h
index ffbf7010a18a3d06e7443ab892d8da0d934b84fc..3a62e354b6f027f5eca10ea2c2a0f153da6bdf62 100644
--- a/content/browser/devtools/protocol/usage_and_quota_query.h
+++ b/content/browser/devtools/protocol/usage_and_quota_query.h
@@ -15,7 +15,8 @@ namespace page {
 // This class can only be used on IO thread.
 class UsageAndQuotaQuery : public base::RefCounted<UsageAndQuotaQuery> {
  public:
-  using Callback = base::Callback<void(scoped_ptr<QueryUsageAndQuotaResponse>)>;
+  using Callback =
+      base::Callback<void(scoped_refptr<QueryUsageAndQuotaResponse>)>;
 
   UsageAndQuotaQuery(scoped_refptr<storage::QuotaManager> quota_manager,
                      const GURL& security_origin,
@@ -24,6 +25,8 @@ class UsageAndQuotaQuery : public base::RefCounted<UsageAndQuotaQuery> {
  private:
   friend class base::RefCounted<UsageAndQuotaQuery>;
 
+  using UsageItems = std::vector<scoped_refptr<UsageItem>>;
+
   virtual ~UsageAndQuotaQuery();
 
   void DidGetTemporaryQuota(storage::QuotaStatusCode status,
@@ -32,20 +35,25 @@ class UsageAndQuotaQuery : public base::RefCounted<UsageAndQuotaQuery> {
 
   void DidGetPersistentQuota(storage::QuotaStatusCode status, int64 value);
 
-  using UsageItemsCallback =
-      base::Callback<void(const std::vector<UsageItem>&)>;
+  void GetHostUsage(UsageItems* list, storage::StorageType storage_type);
 
-  void GetHostUsage(storage::StorageType storage_type,
-                    const UsageItemsCallback& items_callback);
+  void GetUsageForClient(UsageItems* list,
+                         storage::StorageType storage_type,
+                         storage::QuotaClient::ID client_id,
+                         const std::string& client_name);
 
-  void DidGetHostUsage(const UsageItemsCallback& items_callback,
-                       const std::vector<UsageItem>& usage_list);
+  void DidGetUsageForClient(UsageItems* list,
+                            const std::string& client_name,
+                            int64 value);
 
   scoped_refptr<storage::QuotaManager> quota_manager_;
   GURL security_origin_;
   Callback callback_;
-  Quota quota_;
-  Usage usage_;
+  double temporary_quota_;
+  double persistent_quota_;
+  UsageItems temporary_usage_;
+  UsageItems persistent_usage_;
+  UsageItems syncable_usage_;
 };
 
 }  // namespace page