ServiceWorker: Consolidate version change messages

content/browser/service_worker/service_worker_provider_host_unittest.cc

Index: content/browser/service_worker/service_worker_provider_host_unittest.cc
diff --git a/content/browser/service_worker/service_worker_provider_host_unittest.cc b/content/browser/service_worker/service_worker_provider_host_unittest.cc
index 440ad5877d62b41080f6d87a02fb4b197205265a..1d7e4093e2200cdddf6125911d62a6cc013259d0 100644
--- a/content/browser/service_worker/service_worker_provider_host_unittest.cc
+++ b/content/browser/service_worker/service_worker_provider_host_unittest.cc
@@ -47,6 +47,8 @@ class ServiceWorkerProviderHostTest : public testing::Test {
     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()));
@@ -61,14 +63,20 @@ class ServiceWorkerProviderHostTest : public testing::Test {
 
   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_;