Decouple script_url from ServiceWorkerRegistration

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 "base/thread_task_runner_handle.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"
@@ skipping 18 matching lines @@
                                      base::ThreadTaskRunnerHandle::Get(),
                                      base::ThreadTaskRunnerHandle::Get(),
                                      base::ThreadTaskRunnerHandle::Get(),
                                      NULL,
                                      NULL,
                                      NULL));
 
     scope_ = GURL("http://www.example.com/");
     script_url_ = GURL("http://www.example.com/service_worker.js");
     registration_ = new ServiceWorkerRegistration(
-        scope_, script_url_, 1L, context_->AsWeakPtr());
+        scope_, 1L, context_->AsWeakPtr());
     version_ = new ServiceWorkerVersion(
-        registration_,
-        1L, context_->AsWeakPtr());
+        registration_, script_url_, 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));
     provider_host1_ = host1->AsWeakPtr();
     provider_host2_ = host2->AsWeakPtr();
@@ skipping 135 matching lines @@
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 }
 
 TEST_F(ServiceWorkerProviderHostTest,
        ObserveVersionAttributesChanged_MultipleVersions) {
   provider_host1_->AssociateRegistration(registration_);
   provider_host2_->AssociateRegistration(registration_);
   VerifyVersionAttributes(provider_host1_, NULL, NULL, NULL);
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 
-  scoped_refptr<ServiceWorkerVersion> version1 =
-      new ServiceWorkerVersion(registration_, 10L, context_->AsWeakPtr());
-  scoped_refptr<ServiceWorkerVersion> version2 =
-      new ServiceWorkerVersion(registration_, 20L, context_->AsWeakPtr());
+  scoped_refptr<ServiceWorkerVersion> version1 = new ServiceWorkerVersion(
+      registration_, script_url_, 10L, context_->AsWeakPtr());
+  scoped_refptr<ServiceWorkerVersion> version2 = new ServiceWorkerVersion(
+      registration_, script_url_, 20L, context_->AsWeakPtr());
 
   registration_->SetInstallingVersion(version1);
   VerifyVersionAttributes(provider_host1_, version1, NULL, NULL);
   VerifyVersionAttributes(provider_host2_, version1, NULL, NULL);
 
   registration_->SetWaitingVersion(version1);
   VerifyVersionAttributes(provider_host1_, NULL, version1, NULL);
   VerifyVersionAttributes(provider_host2_, NULL, version1, NULL);
 
   registration_->SetInstallingVersion(version2);
   VerifyVersionAttributes(provider_host1_, version2, version1, NULL);
   VerifyVersionAttributes(provider_host2_, version2, version1, NULL);
 
   // Disassociating the registration should clear all version attributes.
   provider_host2_->UnassociateRegistration();
   VerifyVersionAttributes(provider_host1_, version2, version1, NULL);
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 
   // Shouldn't notify the disassociated provider of the change.
   registration_->SetActiveVersion(version1);
   VerifyVersionAttributes(provider_host1_, version2, NULL, version1);
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 
   registration_->SetActiveVersion(version2);
   VerifyVersionAttributes(provider_host1_, NULL, NULL, version2);
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 }
 
 }  // namespace content