Stop using ServiceWorkerStorage::IsDisabled() from ServiceWorkerRegistry

ServiceWorkerStorage will be encapsulated in a mojo interface and will
be moved outside content/. This means that it can't expose any public
method which returns a value synchronously. IsDisable() returns
a boolean value synchronously so we need to hide it.

ServiceWorkerRegistry needs to know if ServiceWorkerStorage is
disabled without IsDisabled(). This CL introduces a new field that
manages the state. It is updated when a storage operation is failed.
This isn't exactly the same, but should have almost the same effect.

Bug: 1055677
Change-Id: I1aab48eb4bf624c3d4c077d8e13472b188f8607d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2079715
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745374}

content/browser/service_worker/service_worker_registry.cc

@@ -138,7 +138,7 @@ void ServiceWorkerRegistry::FindRegistrationForClientUrl(
 void ServiceWorkerRegistry::FindRegistrationForScope(
     const GURL& scope,
     FindRegistrationCallback callback) {
-  if (storage()->IsDisabled()) {
+  if (is_storage_disabled_) {
     RunSoon(
         FROM_HERE,
         base::BindOnce(std::move(callback),
@@ -165,7 +165,7 @@ void ServiceWorkerRegistry::FindRegistrationForId(
     const GURL& origin,
     FindRegistrationCallback callback) {
   // Registration lookup is expected to abort when storage is disabled.
-  if (storage()->IsDisabled()) {
+  if (is_storage_disabled_) {
     CompleteFindNow(nullptr, blink::ServiceWorkerStatusCode::kErrorAbort,
                     std::move(callback));
     return;
@@ -194,7 +194,7 @@ void ServiceWorkerRegistry::FindRegistrationForIdOnly(
     int64_t registration_id,
     FindRegistrationCallback callback) {
   // Registration lookup is expected to abort when storage is disabled.
-  if (storage()->IsDisabled()) {
+  if (is_storage_disabled_) {
     CompleteFindNow(nullptr, blink::ServiceWorkerStatusCode::kErrorAbort,
                     std::move(callback));
     return;
@@ -266,7 +266,7 @@ void ServiceWorkerRegistry::StoreRegistration(
   DCHECK(registration);
   DCHECK(version);
 
-  if (storage()->IsDisabled()) {
+  if (is_storage_disabled_) {
     RunSoon(FROM_HERE,
             base::BindOnce(std::move(callback),
                            blink::ServiceWorkerStatusCode::kErrorAbort));
@@ -323,7 +323,7 @@ void ServiceWorkerRegistry::DeleteRegistration(
     scoped_refptr<ServiceWorkerRegistration> registration,
     const GURL& origin,
     StatusCallback callback) {
-  if (storage()->IsDisabled()) {
+  if (is_storage_disabled_) {
     RunSoon(FROM_HERE,
             base::BindOnce(std::move(callback),
                            blink::ServiceWorkerStatusCode::kErrorAbort));
@@ -626,6 +626,7 @@ void ServiceWorkerRegistry::GetUserDataForAllRegistrationsByKeyPrefix(
 void ServiceWorkerRegistry::PrepareForDeleteAndStarOver() {
   should_schedule_delete_and_start_over_ = false;
   storage()->Disable();
+  is_storage_disabled_ = true;
 }
 
 void ServiceWorkerRegistry::DeleteAndStartOver(StatusCallback callback) {
@@ -636,6 +637,7 @@ void ServiceWorkerRegistry::DeleteAndStartOver(StatusCallback callback) {
 void ServiceWorkerRegistry::DisableDeleteAndStartOverForTesting() {
   DCHECK(should_schedule_delete_and_start_over_);
   should_schedule_delete_and_start_over_ = false;
+  is_storage_disabled_ = true;
 }
 
 ServiceWorkerRegistration*
@@ -1181,6 +1183,7 @@ void ServiceWorkerRegistry::ScheduleDeleteAndStartOver() {
   context_->ScheduleDeleteAndStartOver();
   // ServiceWorkerContextCore should call PrepareForDeleteAndStartOver().
   DCHECK(!should_schedule_delete_and_start_over_);
+  DCHECK(is_storage_disabled_);
 }
 
 }  // namespace content

content/browser/service_worker/service_worker_registry.h

@@ -332,6 +332,7 @@ class CONTENT_EXPORT ServiceWorkerRegistry {
   ServiceWorkerContextCore* const context_;
 
   std::unique_ptr<ServiceWorkerStorage> storage_;
+  bool is_storage_disabled_ = false;
 
   // For finding registrations being installed or uninstalled.
   using RegistrationRefsById =

content/browser/service_worker/service_worker_storage.cc

@@ -154,7 +154,6 @@ void ServiceWorkerStorage::FindRegistrationForScope(
     case STORAGE_STATE_DISABLED:
       RunSoon(FROM_HERE,
               base::BindOnce(std::move(callback),
-
                              /*data=*/nullptr, /*resources=*/nullptr,
                              ServiceWorkerDatabase::Status::kErrorDisabled));
       return;
@@ -189,9 +188,9 @@ void ServiceWorkerStorage::FindRegistrationForId(
     FindRegistrationDataCallback callback) {
   switch (state_) {
     case STORAGE_STATE_DISABLED:
-      NOTREACHED()
-          << "FindRegistrationForId() should not be called when storage "
-             "is disabled";
+      std::move(callback).Run(
+          /*data=*/nullptr, /*resources=*/nullptr,
+          ServiceWorkerDatabase::Status::kErrorDisabled);
       return;
     case STORAGE_STATE_INITIALIZING:  // Fall-through.
     case STORAGE_STATE_UNINITIALIZED:
@@ -223,9 +222,9 @@ void ServiceWorkerStorage::FindRegistrationForIdOnly(
     FindRegistrationDataCallback callback) {
   switch (state_) {
     case STORAGE_STATE_DISABLED:
-      NOTREACHED()
-          << "FindRegistrationForIdOnly() should not be called when storage "
-             "is disabled";
+      std::move(callback).Run(
+          /*data=*/nullptr, /*resources=*/nullptr,
+          ServiceWorkerDatabase::Status::kErrorDisabled);
       return;
     case STORAGE_STATE_INITIALIZING:  // Fall-through.
     case STORAGE_STATE_UNINITIALIZED:
@@ -854,10 +853,6 @@ void ServiceWorkerStorage::Disable() {
     disk_cache_->Disable();
 }
 
-bool ServiceWorkerStorage::IsDisabled() const {
-  return state_ == STORAGE_STATE_DISABLED;
-}
-
 void ServiceWorkerStorage::PurgeResources(const ResourceList& resources) {
   if (!has_checked_for_stale_resources_)
     DeleteStaleResources();

content/browser/service_worker/service_worker_storage.h

@@ -277,7 +277,6 @@ class CONTENT_EXPORT ServiceWorkerStorage {
   void GetNewResourceId(base::OnceCallback<void(int64_t resource_id)> callback);
 
   void Disable();
-  bool IsDisabled() const;
 
   // Schedules deleting |resources| from the disk cache and removing their keys
   // as purgeable resources from the service worker database. It's OK to call
@@ -431,6 +430,8 @@ class CONTENT_EXPORT ServiceWorkerStorage {
   int64_t NewVersionId();
   int64_t NewResourceId();
 
+  bool IsDisabled() const { return state_ == STORAGE_STATE_DISABLED; }
+
   // Static cross-thread helpers.
   static void CollectStaleResourcesFromDB(
       ServiceWorkerDatabase* database,