Service Worker: Migrate to version_uuid and surface ServiceWorker.id. (Chromium 2/3)

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 <deque>
 #include <map>
 #include <set>
@@ skipping 170 matching lines @@
   // well as that user data.
   void GetUserDataForAllRegistrations(
       const std::string& key,
       const GetUserDataForAllRegistrationsCallback& callback);
 
   // Deletes the storage and starts over.
   void DeleteAndStartOver(const StatusCallback& callback);
 
   // Returns new IDs which are guaranteed to be unique in the storage.
   int64 NewRegistrationId();
-  int64 NewVersionId();
+  std::string NewVersionId();
   int64 NewResourceId();
 
   // Intended for use only by ServiceWorkerRegisterJob and
   // ServiceWorkerRegistration.
   void NotifyInstallingRegistration(
       ServiceWorkerRegistration* registration);
   void NotifyDoneInstallingRegistration(
       ServiceWorkerRegistration* registration,
       ServiceWorkerVersion* version,
       ServiceWorkerStatusCode status);
@@ skipping 41 matching lines @@
                            ClearOnExit);
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerResourceStorageDiskTest,
                            DeleteAndStartOver);
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerResourceStorageDiskTest,
                            DeleteAndStartOver_UnrelatedFileExists);
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerResourceStorageDiskTest,
                            DeleteAndStartOver_OpenedFileExists);
 
   struct InitialData {
     int64 next_registration_id;
-    int64 next_version_id;
     int64 next_resource_id;
     std::set<GURL> origins;
     bool disk_cache_migration_needed;
     bool old_disk_cache_deletion_needed;
 
     InitialData();
     ~InitialData();
   };
 
   // Because there are too many params for base::Bind to wrap a closure around.
@@ skipping 227 matching lines @@
   RegistrationRefsById installing_registrations_;
   RegistrationRefsById uninstalling_registrations_;
 
   // Origins having registations.
   std::set<GURL> registered_origins_;
 
   // Pending database tasks waiting for initialization.
   std::vector<base::Closure> pending_tasks_;
 
   int64 next_registration_id_;
-  int64 next_version_id_;
   int64 next_resource_id_;
 
   enum State {
     UNINITIALIZED,
     INITIALIZING,
     INITIALIZED,
     DISABLED,
   };
   State state_;
 
@@ skipping 19 matching lines @@
   std::set<int64> pending_deletions_;
 
   base::WeakPtrFactory<ServiceWorkerStorage> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerStorage);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STORAGE_H_