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

content/browser/service_worker/embedded_worker_instance_unittest.cc

Index: content/browser/service_worker/embedded_worker_instance_unittest.cc
diff --git a/content/browser/service_worker/embedded_worker_instance_unittest.cc b/content/browser/service_worker/embedded_worker_instance_unittest.cc
index 020d9213ff3fb9fd9946a17541a753a76931fadb..048f1405c4f18eb754b361f8cff2e01b861bc896 100644
--- a/content/browser/service_worker/embedded_worker_instance_unittest.cc
+++ b/content/browser/service_worker/embedded_worker_instance_unittest.cc
@@ -43,7 +43,8 @@ class EmbeddedWorkerInstanceTest : public testing::Test {
   void TearDown() override { helper_.reset(); }
 
   ServiceWorkerStatusCode StartWorker(EmbeddedWorkerInstance* worker,
-                                      int id, const GURL& pattern,
+                                      std::string id,
+                                      const GURL& pattern,
                                       const GURL& url) {
     ServiceWorkerStatusCode status;
     base::RunLoop run_loop;
@@ -75,7 +76,8 @@ TEST_F(EmbeddedWorkerInstanceTest, StartAndStop) {
       embedded_worker_registry()->CreateWorker();
   EXPECT_EQ(EmbeddedWorkerInstance::STOPPED, worker->status());
 
-  const int64 service_worker_version_id = 55L;
+  const std::string service_worker_version_uuid =
+      "12a91837-97e4-46a0-9a9a-d43d75f993d9";
   const GURL pattern("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
@@ -86,10 +88,7 @@ TEST_F(EmbeddedWorkerInstanceTest, StartAndStop) {
   ServiceWorkerStatusCode status;
   base::RunLoop run_loop;
   worker->Start(
-      service_worker_version_id,
-      pattern,
-      url,
-      false,
+      service_worker_version_uuid, pattern, url, false,
       base::Bind(&SaveStatusAndCall, &status, run_loop.QuitClosure()));
   EXPECT_EQ(EmbeddedWorkerInstance::STARTING, worker->status());
   run_loop.Run();
@@ -121,7 +120,8 @@ TEST_F(EmbeddedWorkerInstanceTest, StopWhenDevToolsAttached) {
       embedded_worker_registry()->CreateWorker();
   EXPECT_EQ(EmbeddedWorkerInstance::STOPPED, worker->status());
 
-  const int64 service_worker_version_id = 55L;
+  const std::string service_worker_version_uuid =
+      "12a91837-97e4-46a0-9a9a-d43d75f993d9";
   const GURL pattern("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
@@ -129,8 +129,9 @@ TEST_F(EmbeddedWorkerInstanceTest, StopWhenDevToolsAttached) {
   helper_->SimulateAddProcessToPattern(pattern, kRenderProcessId);
 
   // Start the worker and then call StopIfIdle().
-  EXPECT_EQ(SERVICE_WORKER_OK,
-            StartWorker(worker.get(), service_worker_version_id, pattern, url));
+  EXPECT_EQ(
+      SERVICE_WORKER_OK,
+      StartWorker(worker.get(), service_worker_version_uuid, pattern, url));
   EXPECT_EQ(EmbeddedWorkerInstance::RUNNING, worker->status());
   EXPECT_EQ(kRenderProcessId, worker->process_id());
   worker->StopIfIdle();
@@ -143,8 +144,9 @@ TEST_F(EmbeddedWorkerInstanceTest, StopWhenDevToolsAttached) {
   // Set devtools_attached to true, and do the same.
   worker->set_devtools_attached(true);
 
-  EXPECT_EQ(SERVICE_WORKER_OK,
-            StartWorker(worker.get(), service_worker_version_id, pattern, url));
+  EXPECT_EQ(
+      SERVICE_WORKER_OK,
+      StartWorker(worker.get(), service_worker_version_uuid, pattern, url));
   EXPECT_EQ(EmbeddedWorkerInstance::RUNNING, worker->status());
   EXPECT_EQ(kRenderProcessId, worker->process_id());
   worker->StopIfIdle();