ServiceWorker: Consolidate version change messages

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 29 matching lines @@
         registration_,
         1L, context_->AsWeakPtr());
 
     // Prepare provider hosts (for the same process).
     scoped_ptr<ServiceWorkerProviderHost> host1(new ServiceWorkerProviderHost(
         kRenderProcessId, 1 /* provider_id */,
         context_->AsWeakPtr(), NULL));
     scoped_ptr<ServiceWorkerProviderHost> host2(new ServiceWorkerProviderHost(
         kRenderProcessId, 2 /* provider_id */,
         context_->AsWeakPtr(), NULL));
+    host1->AssociateRegistration(registration_);
+    host2->AssociateRegistration(registration_);
     provider_host1_ = host1->AsWeakPtr();
     provider_host2_ = host2->AsWeakPtr();
     context_->AddProviderHost(make_scoped_ptr(host1.release()));
     context_->AddProviderHost(make_scoped_ptr(host2.release()));
   }
 
   virtual void TearDown() OVERRIDE {
     version_ = 0;
     registration_ = 0;
     context_.reset();
   }
 
   void SetActiveVersion(

[michaeln, 2014/08/11 22:15:41]

would it make sense to use the public
ServiceWorkerRegistration::SetActiveVersion method for thee existing test now?
Also please add tests to specifically check the host listens for regisrtation
version changes.

[nhiroki, 2014/08/12 01:45:56]

Done.
Added tests.

       base::WeakPtr<ServiceWorkerProviderHost> provider_host,
-      ServiceWorkerVersion* version) {
-    provider_host->SetActiveVersion(version);
+      ServiceWorkerVersion* active_version) {
+    provider_host->SetVersionAttributes(
+        provider_host->installing_version(),
+        provider_host->waiting_version(),
+        active_version);
   }
 
   void SetWaitingVersion(
       base::WeakPtr<ServiceWorkerProviderHost> provider_host,
-      ServiceWorkerVersion* version) {
-    provider_host->SetWaitingVersion(version);
+      ServiceWorkerVersion* waiting_version) {
+    provider_host->SetVersionAttributes(
+        provider_host->installing_version(),
+        waiting_version,
+        provider_host->active_version());
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<ServiceWorkerContextCore> context_;
   scoped_refptr<ServiceWorkerRegistration> registration_;
   scoped_refptr<ServiceWorkerVersion> version_;
   base::WeakPtr<ServiceWorkerProviderHost> provider_host1_;
   base::WeakPtr<ServiceWorkerProviderHost> provider_host2_;
   GURL scope_;
   GURL script_url_;
@@ skipping 24 matching lines @@
        SetActiveVersion_MultipleHostsForSameProcess) {
   ASSERT_FALSE(version_->HasProcessToRun());
 
   // Associating version_ to two providers as active version.
   SetActiveVersion(provider_host1_, version_);
   SetActiveVersion(provider_host2_, version_);
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Disassociating one provider_host shouldn't remove all process refs
   // from the version yet.
   SetActiveVersion(provider_host1_, NULL);

[michaeln, 2014/08/11 22:15:41]

This can be accomplished with the public host->UnassociateRegistration() method.

[nhiroki, 2014/08/12 01:45:56]

Done.

   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Disassociating the other provider_host will remove all process refs.
   SetActiveVersion(provider_host2_, NULL);
   ASSERT_FALSE(version_->HasProcessToRun());
 }
 
 TEST_F(ServiceWorkerProviderHostTest, SetWaitingVersion_ProcessStatus) {
   ASSERT_FALSE(version_->HasProcessToRun());
 
@@ skipping 25 matching lines @@
   // from the version yet.
   SetWaitingVersion(provider_host1_, NULL);
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Disassociating the other provider_host will remove all process refs.
   SetWaitingVersion(provider_host2_, NULL);
   ASSERT_FALSE(version_->HasProcessToRun());
 }
 
 }  // namespace content