Decouple script_url from ServiceWorkerRegistration

content/browser/service_worker/service_worker_registration.h

Index: content/browser/service_worker/service_worker_registration.h
diff --git a/content/browser/service_worker/service_worker_registration.h b/content/browser/service_worker/service_worker_registration.h
index 51872d21447396ddf03a71fa57ff9c3882ff4ecc..9ea1e3639499250d580209171efcf1972dc4690a 100644
--- a/content/browser/service_worker/service_worker_registration.h
+++ b/content/browser/service_worker/service_worker_registration.h
@@ -21,10 +21,9 @@ class ServiceWorkerRegistrationInfo;
 class ServiceWorkerVersion;
 
 // This class represents a service worker registration. The
-// scope and script url are constant for the life of the persistent
+// scope is constant for the life of the persistent
 // registration. It's refcounted to facillitate multiple controllees
-// being associated with the same registration. The class roughly
-// corresponds to navigator.serviceWorker.registgration.
+// being associated with the same registration.
 class CONTENT_EXPORT ServiceWorkerRegistration
     : NON_EXPORTED_BASE(public base::RefCounted<ServiceWorkerRegistration>),
       public ServiceWorkerVersion::Listener {
@@ -42,12 +41,10 @@ class CONTENT_EXPORT ServiceWorkerRegistration
   };
 
   ServiceWorkerRegistration(const GURL& pattern,
-                            const GURL& script_url,
                             int64 registration_id,
                             base::WeakPtr<ServiceWorkerContextCore> context);
 
   int64 id() const { return registration_id_; }
-  const GURL& script_url() const { return script_url_; }
   const GURL& pattern() const { return pattern_; }
 
   bool is_deleted() const { return is_deleted_; }
@@ -67,6 +64,8 @@ class CONTENT_EXPORT ServiceWorkerRegistration
     return installing_version_.get();
   }
 
+  ServiceWorkerVersion* GetNewestVersion() const;
+
   void AddListener(Listener* listener);
   void RemoveListener(Listener* listener);
   void NotifyRegistrationFailed();
@@ -133,7 +132,6 @@ class CONTENT_EXPORT ServiceWorkerRegistration
                        ServiceWorkerStatusCode status);
 
   const GURL pattern_;
-  const GURL script_url_;
   const int64 registration_id_;
   bool is_deleted_;
   bool is_uninstalling_;