Service Worker: Remove unnecessary StorageType handling in QuotaClient.

QuotaClient's methods will only be called with a StorageType in the list
of types provided to QuotaManager::RegisterClient(). The QuotaClient
implementation managing service worker registrations only provides
kTemporary, like all modern storage APIs. Therefore, its QuotaClient
implementation does not need to handle other StorageType values.

Bug: 1016065
Change-Id: I15d6cd4dc503790d6ac3a7b1d7bd5c5db0b6da01
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2249635Reviewed-by: Jarryd Goodman <jarrydg@chromium.org>
Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Auto-Submit: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779660}

content/browser/service_worker/service_worker_quota_client.cc

 // Copyright 2014 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.
+
 #include "content/browser/service_worker/service_worker_quota_client.h"
 
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "base/bind.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_usage_info.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom-shared.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
+#include "url/gurl.h"
+#include "url/origin.h"
 
 using blink::mojom::StorageType;
 using storage::QuotaClient;
@@ -56,20 +65,14 @@ ServiceWorkerQuotaClient::~ServiceWorkerQuotaClient() {
 void ServiceWorkerQuotaClient::GetOriginUsage(const url::Origin& origin,
                                               StorageType type,
                                               GetUsageCallback callback) {
-  if (type != StorageType::kTemporary) {
-    std::move(callback).Run(0);
-    return;
-  }
+  DCHECK_EQ(type, StorageType::kTemporary);
   context_->GetAllOriginsInfo(base::BindOnce(
       &FindUsageForOrigin, std::move(callback), origin.GetURL()));
 }
 
 void ServiceWorkerQuotaClient::GetOriginsForType(StorageType type,
                                                  GetOriginsCallback callback) {
-  if (type != StorageType::kTemporary) {
-    std::move(callback).Run(std::set<url::Origin>());
-    return;
-  }
+  DCHECK_EQ(type, StorageType::kTemporary);
   context_->GetAllOriginsInfo(
       base::BindOnce(&ReportOrigins, std::move(callback), false, ""));
 }
@@ -77,10 +80,7 @@ void ServiceWorkerQuotaClient::GetOriginsForType(StorageType type,
 void ServiceWorkerQuotaClient::GetOriginsForHost(StorageType type,
                                                  const std::string& host,
                                                  GetOriginsCallback callback) {
-  if (type != StorageType::kTemporary) {
-    std::move(callback).Run(std::set<url::Origin>());
-    return;
-  }
+  DCHECK_EQ(type, StorageType::kTemporary);
   context_->GetAllOriginsInfo(
       base::BindOnce(&ReportOrigins, std::move(callback), true, host));
 }
@@ -88,10 +88,7 @@ void ServiceWorkerQuotaClient::GetOriginsForHost(StorageType type,
 void ServiceWorkerQuotaClient::DeleteOriginData(const url::Origin& origin,
                                                 StorageType type,
                                                 DeletionCallback callback) {
-  if (type != StorageType::kTemporary) {
-    std::move(callback).Run(blink::mojom::QuotaStatusCode::kOk);
-    return;
-  }
+  DCHECK_EQ(type, StorageType::kTemporary);
   context_->DeleteForOrigin(
       origin.GetURL(),
       base::BindOnce(&ReportToQuotaStatus, std::move(callback)));
@@ -100,10 +97,7 @@ void ServiceWorkerQuotaClient::DeleteOriginData(const url::Origin& origin,
 void ServiceWorkerQuotaClient::PerformStorageCleanup(
     blink::mojom::StorageType type,
     base::OnceClosure callback) {
-  if (type != StorageType::kTemporary) {
-    std::move(callback).Run();
-    return;
-  }
+  DCHECK_EQ(type, StorageType::kTemporary);
   context_->PerformStorageCleanup(std::move(callback));
 }
 

content/browser/service_worker/service_worker_quota_client.h

@@ -5,13 +5,17 @@
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_QUOTA_CLIENT_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_QUOTA_CLIENT_H_
 
+#include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
 #include "storage/browser/quota/quota_client.h"
 #include "storage/browser/quota/quota_client_type.h"
 #include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
-#include "url/origin.h"
+
+namespace url {
+class Origin;
+}  // namespace url
 
 namespace content {
 class ServiceWorkerContextWrapper;