Adds class ServiceWorkerScriptCacheMap and new ServiceWorkerVersion::Listener methods related to sc…

content/browser/service_worker/service_worker_version.h

Index: content/browser/service_worker/service_worker_version.h
diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h
index 84ecc011ad01a8ac62416fc1f35d59198dba6a5a..56c5cf22756a6b406f13205fd70c2dc4fed953dd 100644
--- a/content/browser/service_worker/service_worker_version.h
+++ b/content/browser/service_worker/service_worker_version.h
@@ -15,6 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
+#include "content/browser/service_worker/service_worker_script_cache_map.h"
 #include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "content/common/service_worker/service_worker_types.h"
@@ -95,13 +96,11 @@ class CONTENT_EXPORT ServiceWorkerVersion
 
   int64 version_id() const { return version_id_; }
   int64 registration_id() const { return registration_id_; }
-
+  const GURL& script_url() const { return script_url_; }
   RunningStatus running_status() const {
     return static_cast<RunningStatus>(embedded_worker_->status());
   }
-
   ServiceWorkerVersionInfo GetInfo();
-
   Status status() const { return status_; }
 
   // This sets the new status and also run status change callbacks
@@ -196,8 +195,17 @@ class CONTENT_EXPORT ServiceWorkerVersion
   void AddListener(Listener* listener);
   void RemoveListener(Listener* listener);
 
+  ServiceWorkerScriptCacheMap* script_cache_map() { return &script_cache_map_; }
   EmbeddedWorkerInstance* embedded_worker() { return embedded_worker_.get(); }
 
+ private:
+  typedef ServiceWorkerVersion self;
+  typedef std::map<ServiceWorkerProviderHost*, int> ControlleeMap;
+  typedef IDMap<ServiceWorkerProviderHost> ControlleeByIDMap;
+  friend class base::RefCounted<ServiceWorkerVersion>;
+
+  virtual ~ServiceWorkerVersion();
+
   // EmbeddedWorkerInstance::Listener overrides:
   virtual void OnStarted() OVERRIDE;
   virtual void OnStopped() OVERRIDE;
@@ -212,18 +220,6 @@ class CONTENT_EXPORT ServiceWorkerVersion
                                       const GURL& source_url) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
-  void AddToScriptCache(const GURL& url, int64 resource_id);
-  int64 LookupInScriptCache(const GURL& url);
-
- private:
-  typedef ServiceWorkerVersion self;
-  typedef std::map<ServiceWorkerProviderHost*, int> ControlleeMap;
-  typedef IDMap<ServiceWorkerProviderHost> ControlleeByIDMap;
-  typedef std::map<GURL, int64> ResourceIDMap;
-  friend class base::RefCounted<ServiceWorkerVersion>;
-
-  virtual ~ServiceWorkerVersion();
-
   void RunStartWorkerCallbacksOnError(ServiceWorkerStatusCode status);
 
   void DispatchInstallEventAfterStartWorker(int active_version_id,
@@ -264,8 +260,7 @@ class CONTENT_EXPORT ServiceWorkerVersion
   ControlleeByIDMap controllee_by_id_;
   base::WeakPtr<ServiceWorkerContextCore> context_;
   ObserverList<Listener> listeners_;
-
-  ResourceIDMap script_cache_map_;
+  ServiceWorkerScriptCacheMap script_cache_map_;
 
   base::WeakPtrFactory<ServiceWorkerVersion> weak_factory_;