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 1bfa737d83679f42b96dda6b49c652117d56a3c3..d0741dfb6d0c93fcc4e25b314bf340cc132a8fc7 100644 |
--- a/content/browser/service_worker/service_worker_storage.h |
+++ b/content/browser/service_worker/service_worker_storage.h |
@@ -18,6 +18,7 @@ |
#include "base/memory/weak_ptr.h" |
#include "content/browser/service_worker/service_worker_database.h" |
#include "content/browser/service_worker/service_worker_database_task_manager.h" |
+#include "content/browser/service_worker/service_worker_metrics.h" |
#include "content/browser/service_worker/service_worker_version.h" |
#include "content/common/content_export.h" |
#include "content/common/service_worker/service_worker_status_code.h" |
@@ -37,6 +38,7 @@ namespace content { |
class ServiceWorkerContextCore; |
class ServiceWorkerDiskCache; |
+class ServiceWorkerDiskCacheMigrator; |
class ServiceWorkerRegistration; |
class ServiceWorkerResponseMetadataWriter; |
class ServiceWorkerResponseReader; |
@@ -212,6 +214,7 @@ class CONTENT_EXPORT ServiceWorkerStorage |
friend class ServiceWorkerResourceStorageTest; |
friend class ServiceWorkerControlleeRequestHandlerTest; |
friend class ServiceWorkerContextRequestHandlerTest; |
+ friend class ServiceWorkerDiskCacheMigratorTest; |
friend class ServiceWorkerRequestHandlerTest; |
friend class ServiceWorkerURLRequestJobTest; |
friend class ServiceWorkerVersionBrowserTest; |
@@ -293,14 +296,25 @@ class CONTENT_EXPORT ServiceWorkerStorage |
base::FilePath GetDatabasePath(); |
base::FilePath GetDiskCachePath(); |
+ base::FilePath GetOldDiskCachePath(); |
falken
2015/06/01 04:31:50
Can you add a comment about what the Old* function
nhiroki
2015/06/02 09:18:33
Done.
|
- // Loads the registration data from backend storage. This must be called |
- // before any method that requires registration data. |
bool LazyInitialize( |
const base::Closure& callback); |
+ void DidCheckOldDiskCacheDirectory(bool exists); |
+ void DidInitializeOldDiskCache( |
+ scoped_ptr<ServiceWorkerDiskCache> old_disk_cache, |
+ int result); |
+ void DidDiskCacheMigrated(scoped_ptr<ServiceWorkerDiskCacheMigrator> migrator, |
falken
2015/06/01 04:31:50
nit: this is ungrammatical... maybe DidMigrateDisk
nhiroki
2015/06/02 09:18:33
Done.
|
+ scoped_ptr<ServiceWorkerDiskCache> old_disk_cache, |
+ ServiceWorkerStatusCode status); |
+ void DidDeleteOldDiskCache(bool deleted); |
+ void AbortLazyInitialize( |
+ ServiceWorkerMetrics::DiskCacheMigrationResult result); |
+ void ContinueLazyInitialize(); |
void DidReadInitialData( |
InitialData* data, |
ServiceWorkerDatabase::Status status); |
+ |
void DidFindRegistrationForDocument( |
const GURL& document_url, |
const FindRegistrationCallback& callback, |