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

content/browser/service_worker/service_worker_registration_unittest.cc

Index: content/browser/service_worker/service_worker_registration_unittest.cc
diff --git a/content/browser/service_worker/service_worker_registration_unittest.cc b/content/browser/service_worker/service_worker_registration_unittest.cc
index d61ec06a0cb29b00d0b102fca4ed1ab76122bace..043ba5934ca3e9a088b53da385232f4ad84607e0 100644
--- a/content/browser/service_worker/service_worker_registration_unittest.cc
+++ b/content/browser/service_worker/service_worker_registration_unittest.cc
@@ -96,8 +96,8 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
           kRegistrationId,
           context_ptr_);
 
-  const int64 version_1_id = 1L;
-  const int64 version_2_id = 2L;
+  const std::string version_1_id("153963e6-6f53-46ca-b6d4-b8e6a6158c06");
+  const std::string version_2_id("93943e79-0510-47ab-ad36-f1cc93a1dfab");
   scoped_refptr<ServiceWorkerVersion> version_1 = new ServiceWorkerVersion(
       registration.get(), kScript, version_1_id, context_ptr_);
   scoped_refptr<ServiceWorkerVersion> version_2 = new ServiceWorkerVersion(
@@ -112,12 +112,10 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
   EXPECT_EQ(ChangedVersionAttributesMask::ACTIVE_VERSION,
             listener.observed_changed_mask_.changed());
   EXPECT_EQ(kScope, listener.observed_info_.pattern);
-  EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
+  EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_uuid);
   EXPECT_EQ(kScript, listener.observed_info_.active_version.script_url);
-  EXPECT_EQ(listener.observed_info_.installing_version.version_id,
-            kInvalidServiceWorkerVersionId);
-  EXPECT_EQ(listener.observed_info_.waiting_version.version_id,
-            kInvalidServiceWorkerVersionId);
+  EXPECT_TRUE(listener.observed_info_.installing_version.version_uuid.empty());
+  EXPECT_TRUE(listener.observed_info_.waiting_version.version_uuid.empty());
   listener.Reset();
 
   registration->SetInstallingVersion(version_2);
@@ -125,11 +123,10 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
   EXPECT_EQ(version_2.get(), registration->installing_version());
   EXPECT_EQ(ChangedVersionAttributesMask::INSTALLING_VERSION,
             listener.observed_changed_mask_.changed());
-  EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
+  EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_uuid);
   EXPECT_EQ(version_2_id,
-            listener.observed_info_.installing_version.version_id);
-  EXPECT_EQ(listener.observed_info_.waiting_version.version_id,
-            kInvalidServiceWorkerVersionId);
+            listener.observed_info_.installing_version.version_uuid);
+  EXPECT_TRUE(listener.observed_info_.waiting_version.version_uuid.empty());
   listener.Reset();
 
   registration->SetWaitingVersion(version_2);
@@ -138,10 +135,9 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
   EXPECT_FALSE(registration->installing_version());
   EXPECT_TRUE(listener.observed_changed_mask_.waiting_changed());
   EXPECT_TRUE(listener.observed_changed_mask_.installing_changed());
-  EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
-  EXPECT_EQ(version_2_id, listener.observed_info_.waiting_version.version_id);
-  EXPECT_EQ(listener.observed_info_.installing_version.version_id,
-            kInvalidServiceWorkerVersionId);
+  EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_uuid);
+  EXPECT_EQ(version_2_id, listener.observed_info_.waiting_version.version_uuid);
+  EXPECT_TRUE(listener.observed_info_.installing_version.version_uuid.empty());
   listener.Reset();
 
   registration->UnsetVersion(version_2.get());
@@ -149,11 +145,9 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
   EXPECT_FALSE(registration->waiting_version());
   EXPECT_EQ(ChangedVersionAttributesMask::WAITING_VERSION,
             listener.observed_changed_mask_.changed());
-  EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
-  EXPECT_EQ(listener.observed_info_.waiting_version.version_id,
-            kInvalidServiceWorkerVersionId);
-  EXPECT_EQ(listener.observed_info_.installing_version.version_id,
-            kInvalidServiceWorkerVersionId);
+  EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_uuid);
+  EXPECT_TRUE(listener.observed_info_.waiting_version.version_uuid.empty());
+  EXPECT_TRUE(listener.observed_info_.installing_version.version_uuid.empty());
 }
 
 TEST_F(ServiceWorkerRegistrationTest, FailedRegistrationNoCrash) {