ServiceWorker: some more groundwork in support of the update process

content/browser/service_worker/service_worker_provider_host_unittest.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 "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_register_job.h"
 #include "content/browser/service_worker/service_worker_registration.h"
@@ skipping 133 matching lines @@
   // Disassociating one provider_host shouldn't remove all process refs
   // from the version yet.
   provider_host1_->SetWaitingVersion(NULL);
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Disassociating the other provider_host will remove all process refs.
   provider_host2_->SetWaitingVersion(NULL);
   ASSERT_FALSE(version_->HasProcessToRun());
 }
 
 class ServiceWorkerProviderHostWaitingVersionTest : public testing::Test {

[falken, 2014/07/02 05:42:11]

Maybe this should now be called ServiceWorkerProviderHostAssociatedVersionTest?
Or just ServiceWorkerProviderHostVersionTest?

  protected:
   ServiceWorkerProviderHostWaitingVersionTest()
       : thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP),
         next_provider_id_(1L) {}
   virtual ~ServiceWorkerProviderHostWaitingVersionTest() {}
 
   virtual void SetUp() OVERRIDE {
     context_.reset(
         new ServiceWorkerContextCore(base::FilePath(),
                                      base::MessageLoopProxy::current(),
@@ skipping 28 matching lines @@
   base::WeakPtr<ServiceWorkerProviderHost> provider_host2_;
   base::WeakPtr<ServiceWorkerProviderHost> provider_host3_;
 
  private:
   int64 next_provider_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerProviderHostWaitingVersionTest);
 };
 
 TEST_F(ServiceWorkerProviderHostWaitingVersionTest,
-       AssociateWaitingVersionToDocuments) {
+       AssociateInstallingVersionToDocuments) {
   const GURL scope1("http://www.example.com/*");
   const GURL script_url1("http://www.example.com/service_worker1.js");
   scoped_refptr<ServiceWorkerRegistration> registration1(
       new ServiceWorkerRegistration(
           scope1, script_url1, 1L, context_->AsWeakPtr()));
   scoped_refptr<ServiceWorkerVersion> version1(
       new ServiceWorkerVersion(registration1, 1L, context_->AsWeakPtr()));
 
-  ServiceWorkerRegisterJob::AssociateWaitingVersionToDocuments(
-      context_->AsWeakPtr(), version1.get());
-  EXPECT_EQ(version1.get(), provider_host1_->waiting_version());
-  EXPECT_EQ(version1.get(), provider_host2_->waiting_version());
-  EXPECT_EQ(NULL, provider_host3_->waiting_version());
+  ServiceWorkerRegisterJob::AssociateInstallingVersionToDocuments(
+      context_->AsWeakPtr(), version1);
+  EXPECT_EQ(version1.get(), provider_host1_->installing_version());
+  EXPECT_EQ(version1.get(), provider_host2_->installing_version());
+  EXPECT_EQ(NULL, provider_host3_->installing_version());
 
   // Version2 is associated with the same registration as version1, so the
   // waiting version of host1 and host2 should be replaced.
   scoped_refptr<ServiceWorkerVersion> version2(
       new ServiceWorkerVersion(registration1, 2L, context_->AsWeakPtr()));
-  ServiceWorkerRegisterJob::AssociateWaitingVersionToDocuments(
-      context_->AsWeakPtr(), version2.get());
-  EXPECT_EQ(version2.get(), provider_host1_->waiting_version());
-  EXPECT_EQ(version2.get(), provider_host2_->waiting_version());
-  EXPECT_EQ(NULL, provider_host3_->waiting_version());
+  ServiceWorkerRegisterJob::AssociateInstallingVersionToDocuments(
+      context_->AsWeakPtr(), version2);
+  EXPECT_EQ(version2.get(), provider_host1_->installing_version());
+  EXPECT_EQ(version2.get(), provider_host2_->installing_version());
+  EXPECT_EQ(NULL, provider_host3_->installing_version());
 
   const GURL scope3(provider_host1_->document_url());
   const GURL script_url3("http://www.example.com/service_worker3.js");
   scoped_refptr<ServiceWorkerRegistration> registration3(
       new ServiceWorkerRegistration(
           scope3, script_url3, 3L, context_->AsWeakPtr()));
   scoped_refptr<ServiceWorkerVersion> version3(
       new ServiceWorkerVersion(registration3, 3L, context_->AsWeakPtr()));
 
   // Although version3 can match longer than version2 for host1, it should be
   // ignored because version3 is associated with a different registration from
   // version2.
-  ServiceWorkerRegisterJob::AssociateWaitingVersionToDocuments(
-      context_->AsWeakPtr(), version3.get());
-  EXPECT_EQ(version2.get(), provider_host1_->waiting_version());
-  EXPECT_EQ(version2.get(), provider_host2_->waiting_version());
-  EXPECT_EQ(NULL, provider_host3_->waiting_version());
+  ServiceWorkerRegisterJob::AssociateInstallingVersionToDocuments(
+      context_->AsWeakPtr(), version3);
+  EXPECT_EQ(version2.get(), provider_host1_->installing_version());
+  EXPECT_EQ(version2.get(), provider_host2_->installing_version());
+  EXPECT_EQ(NULL, provider_host3_->installing_version());
 }
 
 TEST_F(ServiceWorkerProviderHostWaitingVersionTest,
-       DisassociateWaitingVersionFromDocuments) {
+       DisassociateVersionFromDocuments) {
   const GURL scope1("http://www.example.com/*");
   const GURL script_url1("http://www.example.com/service_worker.js");
   scoped_refptr<ServiceWorkerRegistration> registration1(
       new ServiceWorkerRegistration(
           scope1, script_url1, 1L, context_->AsWeakPtr()));
   scoped_refptr<ServiceWorkerVersion> version1(
       new ServiceWorkerVersion(registration1, 1L, context_->AsWeakPtr()));
 
   const GURL scope2("http://www.example.ca/*");
   const GURL script_url2("http://www.example.ca/service_worker.js");
   scoped_refptr<ServiceWorkerRegistration> registration2(
       new ServiceWorkerRegistration(
           scope2, script_url2, 2L, context_->AsWeakPtr()));
   scoped_refptr<ServiceWorkerVersion> version2(
       new ServiceWorkerVersion(registration2, 2L, context_->AsWeakPtr()));
 
-  ServiceWorkerRegisterJob::AssociateWaitingVersionToDocuments(
-      context_->AsWeakPtr(), version1.get());
-  ServiceWorkerRegisterJob::AssociateWaitingVersionToDocuments(
-      context_->AsWeakPtr(), version2.get());
+  ServiceWorkerRegisterJob::AssociateInstallingVersionToDocuments(
+      context_->AsWeakPtr(), version1);
+  ServiceWorkerRegisterJob::AssociateInstallingVersionToDocuments(
+      context_->AsWeakPtr(), version2);
 
   // Host1 and host2 are associated with version1 as a waiting version, whereas
   // host3 is associated with version2.
-  EXPECT_EQ(version1.get(), provider_host1_->waiting_version());
-  EXPECT_EQ(version1.get(), provider_host2_->waiting_version());
-  EXPECT_EQ(version2.get(), provider_host3_->waiting_version());
+  EXPECT_EQ(version1.get(), provider_host1_->installing_version());
+  EXPECT_EQ(version1.get(), provider_host2_->installing_version());
+  EXPECT_EQ(version2.get(), provider_host3_->installing_version());
 
   // Disassociate version1 from host1 and host2.
-  ServiceWorkerRegisterJob::DisassociateWaitingVersionFromDocuments(
-      context_->AsWeakPtr(), version1->version_id());
-  EXPECT_EQ(NULL, provider_host1_->waiting_version());
-  EXPECT_EQ(NULL, provider_host2_->waiting_version());
-  EXPECT_EQ(version2.get(), provider_host3_->waiting_version());
+  ServiceWorkerRegisterJob::DisassociateVersionFromDocuments(
+      context_->AsWeakPtr(), version1);
+  EXPECT_EQ(NULL, provider_host1_->installing_version());
+  EXPECT_EQ(NULL, provider_host2_->installing_version());
+  EXPECT_EQ(version2.get(), provider_host3_->installing_version());
 }
 
 }  // namespace content