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

content/browser/service_worker/service_worker_context_wrapper.cc

 // 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.
 
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 267 matching lines @@
     LOG(ERROR) << "ServiceWorkerContextCore is no longer alive.";
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             base::Bind(callback, SERVICE_WORKER_ERROR_ABORT));
     return;
   }
   context_core_->storage()->FindRegistrationForPattern(
       net::SimplifyUrlForRequest(pattern),
       base::Bind(&StartActiveWorkerOnIO, callback));
 }
 
-void ServiceWorkerContextWrapper::SimulateSkipWaiting(int64_t version_id) {
+void ServiceWorkerContextWrapper::SimulateSkipWaiting(
+    std::string version_uuid) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&ServiceWorkerContextWrapper::SimulateSkipWaiting, this,
-                   version_id));
+                   version_uuid));
     return;
   }
   if (!context_core_.get()) {
     LOG(ERROR) << "ServiceWorkerContextCore is no longer alive.";
     return;
   }
-  ServiceWorkerVersion* version = GetLiveVersion(version_id);
+  ServiceWorkerVersion* version = GetLiveVersion(version_uuid);
   if (!version || version->skip_waiting())
     return;
   ServiceWorkerRegistration* registration =
       GetLiveRegistration(version->registration_id());
   if (!registration || version != registration->waiting_version())
     return;
   version->set_skip_waiting(true);
   registration->ActivateWaitingVersionWhenReady();
 }
 
@@ skipping 150 matching lines @@
 
 ServiceWorkerRegistration* ServiceWorkerContextWrapper::GetLiveRegistration(
     int64_t registration_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!context_core_)
     return nullptr;
   return context_core_->GetLiveRegistration(registration_id);
 }
 
 ServiceWorkerVersion* ServiceWorkerContextWrapper::GetLiveVersion(
-    int64_t version_id) {
+    std::string version_uuid) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!context_core_)
     return nullptr;
-  return context_core_->GetLiveVersion(version_id);
+  return context_core_->GetLiveVersion(version_uuid);
 }
 
 std::vector<ServiceWorkerRegistrationInfo>
 ServiceWorkerContextWrapper::GetAllLiveRegistrationInfo() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!context_core_)
     return std::vector<ServiceWorkerRegistrationInfo>();
   return context_core_->GetAllLiveRegistrationInfo();
 }
 
@@ skipping 157 matching lines @@
   observer_list_->Notify(FROM_HERE,
                          &ServiceWorkerContextObserver::OnStorageWiped);
 }
 
 ServiceWorkerContextCore* ServiceWorkerContextWrapper::context() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   return context_core_.get();
 }
 
 }  // namespace content