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

content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc

Index: content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc
diff --git a/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc b/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc
index 7f6aabc69edbfd457726bb28dd1c8aeeaf7190c4..33f16be299335649f7b8263e57faac15dfbf278d 100644
--- a/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/guid.h"
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ -296,7 +297,6 @@ class ServiceWorkerWriteToCacheJobTest : public testing::Test {
 
   int NextRenderProcessId() { return next_render_process_id_++; }
   int NextProviderId() { return next_provider_id_++; }
-  int NextVersionId() { return next_version_id_++; }
 
   void SetUp() override {
     int render_process_id = NextRenderProcessId();
@@ -309,9 +309,10 @@ class ServiceWorkerWriteToCacheJobTest : public testing::Test {
     script_url_ = GURL("https://host/script.js");
     registration_ =
         new ServiceWorkerRegistration(scope_, 1L, context()->AsWeakPtr());
-    version_ =
-        new ServiceWorkerVersion(registration_.get(), script_url_,
-                                 NextVersionId(), context()->AsWeakPtr());
+    version_ = new ServiceWorkerVersion(
+        registration_.get(), script_url_,
+        std::string("8f8c6868-e838-4296-847a-6a8d6b552884"),
+        context()->AsWeakPtr());
     CreateHostForVersion(render_process_id, provider_id, version_);
     SetUpScriptRequest(render_process_id, provider_id);
 
@@ -365,7 +366,7 @@ class ServiceWorkerWriteToCacheJobTest : public testing::Test {
     int provider_id = NextProviderId();
     scoped_refptr<ServiceWorkerVersion> new_version =
         new ServiceWorkerVersion(registration_.get(), script_url_,
-                                 NextVersionId(), context()->AsWeakPtr());
+                                 base::GenerateGUID(), context()->AsWeakPtr());
     CreateHostForVersion(render_process_id, provider_id, new_version);
 
     SetUpScriptRequest(render_process_id, provider_id);