Service Worker: Delay stale resource cleanup

content/browser/service_worker/service_worker_storage_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 506 matching lines @@
     data.script = script_;
     data.version_id = version_id_;
     data.is_active = false;
     std::vector<ResourceRecord> resources;
     resources.push_back(ResourceRecord(resource_id1_, script_));
     resources.push_back(ResourceRecord(resource_id2_, import_));
     registration_ = storage()->GetOrCreateRegistration(data, resources);
     registration_->waiting_version()->SetStatus(ServiceWorkerVersion::NEW);
 
     // Add the resources ids to the uncommitted list.
-    std::set<int64> resource_ids;
-    resource_ids.insert(resource_id1_);
-    resource_ids.insert(resource_id2_);
+    storage()->StoreUncommittedResponseId(resource_id1_);
+    storage()->StoreUncommittedResponseId(resource_id2_);
+    base::RunLoop().RunUntilIdle();
+    std::set<int64> verify_ids;
     EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
-              storage()->database_->WriteUncommittedResourceIds(resource_ids));
+              storage()->database_->GetUncommittedResourceIds(&verify_ids));
+    EXPECT_EQ(2u, verify_ids.size());
 
     // And dump something in the disk cache for them.
     WriteBasicResponse(storage(), resource_id1_);
     WriteBasicResponse(storage(), resource_id2_);
     EXPECT_TRUE(VerifyBasicResponse(storage(), resource_id1_, true));
     EXPECT_TRUE(VerifyBasicResponse(storage(), resource_id2_, true));
 
     // Storing the registration/version should take the resources ids out
     // of the uncommitted list.
     EXPECT_EQ(
         SERVICE_WORKER_OK,
         StoreRegistration(registration_, registration_->waiting_version()));
-    std::set<int64> verify_ids;
+    verify_ids.clear();
     EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
               storage()->database_->GetUncommittedResourceIds(&verify_ids));
     EXPECT_TRUE(verify_ids.empty());
   }
 
  protected:
   GURL scope_;
   GURL script_;
   GURL import_;
   GURL document_url_;
@@ skipping 137 matching lines @@
   EXPECT_EQ(SERVICE_WORKER_OK, result);
   EXPECT_EQ(2u, verify_ids.size());
   verify_ids.clear();
   EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
             storage()->database_->GetPurgeableResourceIds(&verify_ids));
   EXPECT_EQ(2u, verify_ids.size());
 
   EXPECT_TRUE(VerifyBasicResponse(storage(), resource_id1_, true));
   EXPECT_TRUE(VerifyBasicResponse(storage(), resource_id2_, true));
 
-  // Simulate browser restart. This should trigger stale resource purging.
+  // Also add an uncommitted resource.
+  int64 kStaleUncommittedResourceId = storage()->NewResourceId();
+  storage()->StoreUncommittedResponseId(kStaleUncommittedResourceId);
+  base::RunLoop().RunUntilIdle();
+  verify_ids.clear();
+  EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
+            storage()->database_->GetUncommittedResourceIds(&verify_ids));
+  EXPECT_EQ(1u, verify_ids.size());
+  WriteBasicResponse(storage(), kStaleUncommittedResourceId);
+  EXPECT_TRUE(
+      VerifyBasicResponse(storage(), kStaleUncommittedResourceId, true));
+
+  // Simulate browser shutdown. The purgeable and uncommitted resources are now
+  // stale.
   context_.reset();
   context_.reset(new ServiceWorkerContextCore(GetUserDataDirectory(),
                                               base::MessageLoopProxy::current(),
                                               base::MessageLoopProxy::current(),
                                               NULL,
                                               NULL,
                                               NULL));
-  // Use FindRegistration to force storage system initialization.
-  scoped_refptr<ServiceWorkerRegistration> found_registration;
-  FindRegistrationForDocument(document_url_, &found_registration);
+  storage()->LazyInitialize(base::Bind(&base::DoNothing));
   base::RunLoop().RunUntilIdle();
 
-  // Stale resources should be gone.
+  // Store a new uncommitted resource. This triggers stale resource cleanup.
+  int64 kNewResourceId = storage()->NewResourceId();
+  WriteBasicResponse(storage(), kNewResourceId);
+  storage()->StoreUncommittedResponseId(kNewResourceId);
+  base::RunLoop().RunUntilIdle();
+
+  // The stale resources should be purged, but the new resource should persist.
+  verify_ids.clear();
+  EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
+            storage()->database_->GetUncommittedResourceIds(&verify_ids));
+  ASSERT_EQ(1u, verify_ids.size());
+  EXPECT_EQ(kNewResourceId, *verify_ids.begin());
+
   verify_ids.clear();
   EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK,
             storage()->database_->GetPurgeableResourceIds(&verify_ids));
   EXPECT_TRUE(verify_ids.empty());
   EXPECT_FALSE(VerifyBasicResponse(storage(), resource_id1_, false));
   EXPECT_FALSE(VerifyBasicResponse(storage(), resource_id2_, false));
+  EXPECT_FALSE(
+      VerifyBasicResponse(storage(), kStaleUncommittedResourceId, false));
+  EXPECT_TRUE(VerifyBasicResponse(storage(), kNewResourceId, true));
 }
 
 TEST_F(ServiceWorkerResourceStorageTest, UpdateRegistration) {
   // Promote the worker to active worker and add a controllee.
   registration_->SetActiveVersion(registration_->waiting_version());
   storage()->UpdateToActiveState(
       registration_, base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));
   scoped_ptr<ServiceWorkerProviderHost> host(
       new ServiceWorkerProviderHost(33 /* dummy render process id */,
                                     1 /* dummy provider_id */,
@@ skipping 119 matching lines @@
   storage()->NotifyDoneInstallingRegistration(
       live_registration3, NULL, SERVICE_WORKER_OK);
 
   // Find a registration among installed ones.
   EXPECT_EQ(SERVICE_WORKER_OK,
             FindRegistrationForDocument(kDocumentUrl, &found_registration));
   EXPECT_EQ(live_registration2, found_registration);
 }
 
 }  // namespace content