ServiceWorker: Store registration data in ServiceWorkerDatabase

content/browser/service_worker/service_worker_storage.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_STORAGE_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STORAGE_H_
 
 #include <map>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/service_worker/service_worker_database.h"
 #include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "url/gurl.h"
 
 namespace quota {
 class QuotaManagerProxy;
 }
 
 namespace content {
 
 class ServiceWorkerContextCore;
 class ServiceWorkerRegistration;
+class ServiceWorkerRegistrationData;
 class ServiceWorkerRegistrationInfo;
 class ServiceWorkerVersion;
 
 // This class provides an interface to store and retrieve ServiceWorker
 // registration data.
 class CONTENT_EXPORT ServiceWorkerStorage {
  public:
   typedef base::Callback<void(ServiceWorkerStatusCode status)> StatusCallback;
   typedef base::Callback<void(ServiceWorkerStatusCode status,
                               const scoped_refptr<ServiceWorkerRegistration>&
@@ skipping 51 matching lines @@
 
   // Returns new IDs which are guaranteed to be unique in the storage.
   int64 NewRegistrationId();
   int64 NewVersionId();
   int64 NewResourceId();
 
  private:
   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_;
   int64 last_version_id_;
   int64 last_resource_id_;
   bool simulated_lazy_initted_;
 
   base::FilePath path_;
   base::WeakPtr<ServiceWorkerContextCore> context_;
   scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerStorage);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STORAGE_H_