Decouple script_url from ServiceWorkerRegistration

content/browser/service_worker/service_worker_registration.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REGISTRATION_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REGISTRATION_H_
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/service_worker/service_worker_version.h"
 #include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "url/gurl.h"
 
 namespace content {
 
 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 {
  public:
   typedef base::Callback<void(ServiceWorkerStatusCode status)> StatusCallback;
 
   class Listener {
    public:
     virtual void OnVersionAttributesChanged(
         ServiceWorkerRegistration* registration,
         ChangedVersionAttributesMask changed_mask,
         const ServiceWorkerRegistrationInfo& info) = 0;
     virtual void OnRegistrationFailed(
         ServiceWorkerRegistration* registration) = 0;
   };
 
   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_; }
   void set_is_deleted(bool deleted) { is_deleted_ = deleted; }
 
   bool is_uninstalling() const { return is_uninstalling_; }
 
   ServiceWorkerVersion* active_version() const {
     return active_version_.get();
   }
 
   ServiceWorkerVersion* waiting_version() const {
     return waiting_version_.get();
   }
 
   ServiceWorkerVersion* installing_version() const {
     return installing_version_.get();
   }
 
+  ServiceWorkerVersion* GetNewestVersion() const;
+
   void AddListener(Listener* listener);
   void RemoveListener(Listener* listener);
   void NotifyRegistrationFailed();
 
   ServiceWorkerRegistrationInfo GetInfo();
 
   // Sets the corresposding version attribute and resets the position
   // (if any) left vacant (ie. by a waiting version being promoted).
   // Also notifies listeners via OnVersionAttributesChanged.
   void SetActiveVersion(ServiceWorkerVersion* version);
@@ skipping 46 matching lines @@
       ServiceWorkerVersion* activating_version,
       ServiceWorkerStatusCode status);
   void OnDeleteFinished(ServiceWorkerStatusCode status);
 
   // This method corresponds to the [[ClearRegistration]] algorithm.
   void Clear();
   void OnStoreFinished(scoped_refptr<ServiceWorkerVersion> version,
                        ServiceWorkerStatusCode status);
 
   const GURL pattern_;
-  const GURL script_url_;
   const int64 registration_id_;
   bool is_deleted_;
   bool is_uninstalling_;
   bool should_activate_when_ready_;
   base::Time last_update_check_;
   scoped_refptr<ServiceWorkerVersion> active_version_;
   scoped_refptr<ServiceWorkerVersion> waiting_version_;
   scoped_refptr<ServiceWorkerVersion> installing_version_;
   ObserverList<Listener> listeners_;
   base::WeakPtr<ServiceWorkerContextCore> context_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerRegistration);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REGISTRATION_H_