ServiceWorker: Introduce ServiceWorkerRegistrationObjectInfo for cleanup

content/child/service_worker/service_worker_registration_handle_reference.h

Index: content/child/service_worker/service_worker_registration_handle_reference.h
diff --git a/content/child/service_worker/service_worker_registration_handle_reference.h b/content/child/service_worker/service_worker_registration_handle_reference.h
index fdfb1095cc881a986d18b421649d8c5fd581b483..066c89f4fb8ef20af3b3afbcf2e49c4f79ff7d3c 100644
--- a/content/child/service_worker/service_worker_registration_handle_reference.h
+++ b/content/child/service_worker/service_worker_registration_handle_reference.h
@@ -7,42 +7,39 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/common/service_worker/service_worker_types.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class ThreadSafeSender;
-struct ServiceWorkerObjectInfo;
 
 class ServiceWorkerRegistrationHandleReference {
  public:
   // Creates a new ServiceWorkerRegistrationHandleReference and increments
   // ref-count.
   static scoped_ptr<ServiceWorkerRegistrationHandleReference> Create(
-      int registration_handle_id,
-      const ServiceWorkerObjectInfo& info,
+      const ServiceWorkerRegistrationObjectInfo& info,
       ThreadSafeSender* sender);
 
   // Creates a new ServiceWorkerRegistrationHandleReference by adopting a
   // ref-count.
   static scoped_ptr<ServiceWorkerRegistrationHandleReference> Adopt(
-      int registration_handle_id,
-      const ServiceWorkerObjectInfo& info,
+      const ServiceWorkerRegistrationObjectInfo& info,
       ThreadSafeSender* sender);
 
   ~ServiceWorkerRegistrationHandleReference();
 
-  int handle_id() const { return handle_id_; }
-  GURL scope() const { return scope_; }
+  int handle_id() const { return info_.handle_id; }
+  GURL scope() const { return info_.scope; }
 
  private:
-  ServiceWorkerRegistrationHandleReference(int registration_handle_id,
-                                           const ServiceWorkerObjectInfo& info,
-                                           ThreadSafeSender* sender,
-                                           bool increment_ref_in_ctor);
+  ServiceWorkerRegistrationHandleReference(
+      const ServiceWorkerRegistrationObjectInfo& info,
+      ThreadSafeSender* sender,
+      bool increment_ref_in_ctor);
 
-  const int handle_id_;
-  const GURL scope_;
+  ServiceWorkerRegistrationObjectInfo info_;
   scoped_refptr<ThreadSafeSender> sender_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerRegistrationHandleReference);