ServiceWorker: Store registration data in ServiceWorkerDatabase

content/browser/service_worker/service_worker_storage.h

Index: content/browser/service_worker/service_worker_storage.h
diff --git a/content/browser/service_worker/service_worker_storage.h b/content/browser/service_worker/service_worker_storage.h
index ffe877de5bb6da045352a8d524a52d5fa169acde..bbeebe6596b72a608f21f53452e3e5558f212f9d 100644
--- a/content/browser/service_worker/service_worker_storage.h
+++ b/content/browser/service_worker/service_worker_storage.h
@@ -26,6 +26,7 @@ namespace content {
 
 class ServiceWorkerContextCore;
 class ServiceWorkerRegistration;
+class ServiceWorkerRegistrationData;
 class ServiceWorkerRegistrationInfo;
 class ServiceWorkerVersion;
 
@@ -97,19 +98,16 @@ class CONTENT_EXPORT ServiceWorkerStorage {
   friend class ServiceWorkerStorageTest;
 
   scoped_refptr<ServiceWorkerRegistration> CreateRegistration(
-      const ServiceWorkerDatabase::RegistrationData* data);
+      const ServiceWorkerRegistrationData* data);
 
   // TODO(michaeln): Store these structs in a database.
-  typedef std::map<int64, ServiceWorkerDatabase::RegistrationData>
-      RegistrationsMap;
-  typedef std::map<GURL, RegistrationsMap>
-      OriginRegistrationsMap;
+  typedef std::map<int64, ServiceWorkerRegistrationData> RegistrationsMap;
+  typedef std::map<GURL, RegistrationsMap> OriginRegistrationsMap;
   OriginRegistrationsMap stored_registrations_;
 
   // For iterating and lookup based on id only, this map holds
   // pointers to the values stored in the OriginRegistrationsMap.
-  typedef std::map<int64, ServiceWorkerDatabase::RegistrationData*>
-      RegistrationPtrMap;
+  typedef std::map<int64, ServiceWorkerRegistrationData*> RegistrationPtrMap;
   RegistrationPtrMap registrations_by_id_;
 
   int64 last_registration_id_;