Decouple script_url from ServiceWorkerRegistration

content/browser/service_worker/service_worker_registration_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 "content/browser/service_worker/service_worker_registration.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 68 matching lines @@
   BrowserThreadImpl io_thread_;
 };
 
 TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
   const GURL kScope("http://www.example.not/");
   const GURL kScript("http://www.example.not/service_worker.js");
   int64 kRegistrationId = 1L;
   scoped_refptr<ServiceWorkerRegistration> registration =
       new ServiceWorkerRegistration(
           kScope,
-          kScript,
           kRegistrationId,
           context_ptr_);
 
   const int64 version_1_id = 1L;
   const int64 version_2_id = 2L;
-  scoped_refptr<ServiceWorkerVersion> version_1 =
-      new ServiceWorkerVersion(registration.get(), version_1_id, context_ptr_);
-  scoped_refptr<ServiceWorkerVersion> version_2 =
-      new ServiceWorkerVersion(registration.get(), version_2_id, context_ptr_);
+  scoped_refptr<ServiceWorkerVersion> version_1 = new ServiceWorkerVersion(
+      registration.get(), kScript, version_1_id, context_ptr_);
+  scoped_refptr<ServiceWorkerVersion> version_2 = new ServiceWorkerVersion(
+      registration.get(), kScript, version_2_id, context_ptr_);
 
   RegistrationListener listener;
   registration->AddListener(&listener);
   registration->SetActiveVersion(version_1.get());
 
   EXPECT_EQ(version_1.get(), registration->active_version());
   EXPECT_EQ(registration, listener.observed_registration_);
   EXPECT_EQ(ChangedVersionAttributesMask::ACTIVE_VERSION,
             listener.observed_changed_mask_.changed());
   EXPECT_EQ(kScope, listener.observed_info_.pattern);
-  EXPECT_EQ(kScript, listener.observed_info_.script_url);
   EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
+  EXPECT_EQ(kScript, listener.observed_info_.active_version.script_url);
   EXPECT_TRUE(listener.observed_info_.installing_version.is_null);
   EXPECT_TRUE(listener.observed_info_.waiting_version.is_null);
   EXPECT_TRUE(listener.observed_info_.controlling_version.is_null);
   listener.Reset();
 
   registration->SetInstallingVersion(version_2.get());
 
   EXPECT_EQ(version_2.get(), registration->installing_version());
   EXPECT_EQ(ChangedVersionAttributesMask::INSTALLING_VERSION,
             listener.observed_changed_mask_.changed());
@@ skipping 22 matching lines @@
   EXPECT_EQ(ChangedVersionAttributesMask::WAITING_VERSION,
             listener.observed_changed_mask_.changed());
   EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
   EXPECT_TRUE(listener.observed_info_.waiting_version.is_null);
   EXPECT_TRUE(listener.observed_info_.installing_version.is_null);
   EXPECT_TRUE(listener.observed_info_.controlling_version.is_null);
 }
 
 TEST_F(ServiceWorkerRegistrationTest, FailedRegistrationNoCrash) {
   const GURL kScope("http://www.example.not/");
-  const GURL kScript("http://www.example.not/service_worker.js");
   int64 kRegistrationId = 1L;
   int kProviderId = 1;
   scoped_refptr<ServiceWorkerRegistration> registration =
       new ServiceWorkerRegistration(
           kScope,
-          kScript,
           kRegistrationId,
           context_ptr_);
   scoped_ptr<ServiceWorkerRegistrationHandle> handle(
       new ServiceWorkerRegistrationHandle(context_ptr_,
                                           NULL,
                                           kProviderId,
                                           registration.get()));
   registration->NotifyRegistrationFailed();
   // Don't crash when handle gets destructed.
 }
 
 }  // namespace content