ServiceWorker: Migrate the script cache backend from BlockFile to Simple

content/browser/service_worker/service_worker_disk_cache_migrator.h

Index: content/browser/service_worker/service_worker_disk_cache_migrator.h
diff --git a/content/browser/service_worker/service_worker_disk_cache_migrator.h b/content/browser/service_worker/service_worker_disk_cache_migrator.h
index 283db71a4abfde10662b44ed6874650eb704b2b3..cbf16e24f8fad5c3967893481a2f1e813b8f89cc 100644
--- a/content/browser/service_worker/service_worker_disk_cache_migrator.h
+++ b/content/browser/service_worker/service_worker_disk_cache_migrator.h
@@ -2,6 +2,9 @@
 // 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_DISK_CACHE_MIGRATOR_H_
+#define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISK_CACHE_MIGRATOR_H_
+
 #include "content/browser/service_worker/service_worker_disk_cache.h"
 
 #include "base/id_map.h"
@@ -31,7 +34,9 @@ class CONTENT_EXPORT ServiceWorkerDiskCacheMigrator {
   void Start(const StatusCallback& callback);
 
  private:
-  friend class ServiceWorkerDiskCacheMigratorTest;
+  FRIEND_TEST_ALL_PREFIXES(ServiceWorkerDiskCacheMigratorTest,
+                           ThrottleInflightTasks);
+
   class Task;
   class WrappedEntry;
 
@@ -59,6 +64,9 @@ class CONTENT_EXPORT ServiceWorkerDiskCacheMigrator {
   scoped_ptr<Task> pending_task_;
   size_t max_number_of_inflight_tasks_ = 10;
 
+  base::TimeTicks start_time_;
+  size_t number_of_migrated_resources_ = 0;
+
   StatusCallback callback_;
 
   base::WeakPtrFactory<ServiceWorkerDiskCacheMigrator> weak_factory_;
@@ -67,3 +75,5 @@ class CONTENT_EXPORT ServiceWorkerDiskCacheMigrator {
 };
 
 }  // namespace content
+
+#endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISK_CACHE_MIGRATOR_H_