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

 // Copyright 2014 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 "base/guid.h"
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/browser/fileapi/mock_url_request_delegate.h"
 #include "content/browser/service_worker/embedded_worker_test_helper.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_context_request_handler.h"
 #include "content/browser/service_worker/service_worker_disk_cache.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
@@ skipping 274 matching lines @@
     ServiceWorkerRequestHandler::InitializeHandler(
         request_.get(), context_wrapper(), &blob_storage_context_, process_id,
         provider_id, false, FETCH_REQUEST_MODE_NO_CORS,
         FETCH_CREDENTIALS_MODE_OMIT, RESOURCE_TYPE_SERVICE_WORKER,
         REQUEST_CONTEXT_TYPE_SERVICE_WORKER, REQUEST_CONTEXT_FRAME_TYPE_NONE,
         scoped_refptr<ResourceRequestBody>());
   }
 
   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();
     int provider_id = NextProviderId();
     helper_.reset(
         new EmbeddedWorkerTestHelper(base::FilePath(), render_process_id));
 
     // A new unstored registration/version.
     scope_ = GURL("https://host/scope/");
     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);
 
     context()->storage()->LazyInitialize(base::Bind(&EmptyCallback));
     base::RunLoop().RunUntilIdle();
   }
 
   void TearDown() override {
     request_.reset();
     url_request_context_.reset();
@@ skipping 33 matching lines @@
   }
 
   // Performs the net request for an update of |registration_|'s incumbent
   // to the script |response|. Returns the new version.
   scoped_refptr<ServiceWorkerVersion> UpdateScript(
       const std::string& response) {
     int render_process_id = NextRenderProcessId();
     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);
     mock_protocol_handler_->SetCreateJobCallback(
         base::Bind(&CreateResponseJob, response));
     request_->Start();
     base::RunLoop().RunUntilIdle();
     return new_version;
   }
 
@@ skipping 188 matching lines @@
   version = UpdateScript(std::string());
   VerifyResource(GetResourceId(version.get()), std::string());
   registration_->SetWaitingVersion(version);
 
   // Update from empty to empty.
   version = UpdateScript(std::string());
   EXPECT_EQ(kInvalidServiceWorkerResponseId, GetResourceId(version.get()));
 }
 
 }  // namespace content