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

content/browser/service_worker/service_worker_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/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/embedded_worker_test_helper.h"
@@ skipping 342 matching lines @@
 
   ASSERT_EQ(new_registration, old_registration);
 }
 
 class FailToStartWorkerTestHelper : public EmbeddedWorkerTestHelper {
  public:
   explicit FailToStartWorkerTestHelper(int mock_render_process_id)
       : EmbeddedWorkerTestHelper(base::FilePath(), mock_render_process_id) {}
 
   void OnStartWorker(int embedded_worker_id,
-                     int64 service_worker_version_id,
+                     std::string service_worker_version_uuid,
                      const GURL& scope,
                      const GURL& script_url,
                      bool pause_after_download) override {
     EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
     registry()->OnWorkerStopped(worker->process_id(), embedded_worker_id);
   }
 };
 
 TEST_F(ServiceWorkerJobTest, Register_FailToStartWorker) {
   helper_.reset(new FailToStartWorkerTestHelper(render_process_id_));
@@ skipping 260 matching lines @@
 // unregistration.
 TEST_F(ServiceWorkerJobTest, UnregisterWaitingSetsRedundant) {
   GURL script_url("http://www.example.com/service_worker.js");
   scoped_refptr<ServiceWorkerRegistration> registration =
       RunRegisterJob(GURL("http://www.example.com/"), script_url);
   ASSERT_TRUE(registration.get());
 
   // Manually create the waiting worker since there is no way to become a
   // waiting worker until Update is implemented.
   scoped_refptr<ServiceWorkerVersion> version = new ServiceWorkerVersion(
-      registration.get(), script_url, 1L, helper_->context()->AsWeakPtr());
+      registration.get(), script_url,
+      std::string("2939b50b-fc8d-46ad-86e4-b4295b8fbc86"),
+      helper_->context()->AsWeakPtr());
   ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
   version->StartWorker(CreateReceiverOnCurrentThread(&status));
   base::RunLoop().RunUntilIdle();
   ASSERT_EQ(SERVICE_WORKER_OK, status);
 
   version->SetStatus(ServiceWorkerVersion::INSTALLED);
   registration->SetWaitingVersion(version);
   EXPECT_EQ(ServiceWorkerVersion::RUNNING,
             version->running_status());
   EXPECT_EQ(ServiceWorkerVersion::INSTALLED, version->status());
@@ skipping 114 matching lines @@
       public ServiceWorkerRegistration::Listener,
       public ServiceWorkerVersion::Listener {
  public:
   struct AttributeChangeLogEntry {
     int64 registration_id;
     ChangedVersionAttributesMask mask;
     ServiceWorkerRegistrationInfo info;
   };
 
   struct StateChangeLogEntry {
-    int64 version_id;
+    std::string version_uuid;
     ServiceWorkerVersion::Status status;
   };
 
   UpdateJobTestHelper(int mock_render_process_id)
       : EmbeddedWorkerTestHelper(base::FilePath(), mock_render_process_id),
         update_found_(false) {}
   ~UpdateJobTestHelper() override {
     if (registration_.get())
       registration_->RemoveListener(this);
   }
@@ skipping 17 matching lines @@
     EXPECT_TRUE(registration.get());
     EXPECT_TRUE(registration->active_version());
     EXPECT_FALSE(registration->installing_version());
     EXPECT_FALSE(registration->waiting_version());
     registration_ = registration;
     return registration;
   }
 
   // EmbeddedWorkerTestHelper overrides
   void OnStartWorker(int embedded_worker_id,
-                     int64 version_id,
+                     std::string version_uuid,
                      const GURL& scope,
                      const GURL& script,
                      bool pause_after_download) override {
     const std::string kMockScriptBody = "mock_script";
     const uint64 kMockScriptSize = 19284;
-    ServiceWorkerVersion* version = context()->GetLiveVersion(version_id);
+    ServiceWorkerVersion* version = context()->GetLiveVersion(version_uuid);
     ASSERT_TRUE(version);
     version->AddListener(this);
 
     if (!pause_after_download) {
       // Spoof caching the script for the initial version.
       int64 resource_id = storage()->NewResourceId();
       version->script_cache_map()->NotifyStartedCaching(script, resource_id);
       WriteStringResponse(storage(), resource_id, kMockScriptBody);
       version->script_cache_map()->NotifyFinishedCaching(
           script, kMockScriptSize, net::URLRequestStatus(), std::string());
     } else {
       // Spoof caching the script for the new version.
       int64 resource_id = storage()->NewResourceId();
       version->script_cache_map()->NotifyStartedCaching(script, resource_id);
       if (script.GetOrigin() == kNoChangeOrigin)
         WriteStringResponse(storage(), resource_id, kMockScriptBody);
       else
         WriteStringResponse(storage(), resource_id, "mock_different_script");
       version->script_cache_map()->NotifyFinishedCaching(
           script, kMockScriptSize, net::URLRequestStatus(), std::string());
     }
     EmbeddedWorkerTestHelper::OnStartWorker(
-        embedded_worker_id, version_id, scope, script, pause_after_download);
+        embedded_worker_id, version_uuid, scope, script, pause_after_download);
   }
 
   // ServiceWorkerRegistration::Listener overrides
   void OnVersionAttributesChanged(
       ServiceWorkerRegistration* registration,
       ChangedVersionAttributesMask changed_mask,
       const ServiceWorkerRegistrationInfo& info) override {
     AttributeChangeLogEntry entry;
     entry.registration_id = registration->id();
     entry.mask = changed_mask;
     entry.info = info;
     attribute_change_log_.push_back(entry);
   }
 
   void OnRegistrationFailed(ServiceWorkerRegistration* registration) override {
     NOTREACHED();
   }
 
   void OnUpdateFound(ServiceWorkerRegistration* registration) override {
     ASSERT_FALSE(update_found_);
     update_found_ = true;
   }
 
   // ServiceWorkerVersion::Listener overrides
   void OnVersionStateChanged(ServiceWorkerVersion* version) override {
     StateChangeLogEntry entry;
-    entry.version_id = version->version_id();
+    entry.version_uuid = version->version_uuid();
     entry.status = version->status();
     state_change_log_.push_back(entry);
   }
 
   scoped_refptr<ServiceWorkerRegistration> registration_;
 
   std::vector<AttributeChangeLogEntry> attribute_change_log_;
   std::vector<StateChangeLogEntry> state_change_log_;
   bool update_found_;
 };
 
 // Helper class for update tests that evicts the active version when the update
 // worker is about to be started.
 class EvictIncumbentVersionHelper : public UpdateJobTestHelper {
  public:
   EvictIncumbentVersionHelper(int mock_render_process_id)
       : UpdateJobTestHelper(mock_render_process_id) {}
   ~EvictIncumbentVersionHelper() override {}
 
   void OnStartWorker(int embedded_worker_id,
-                     int64 version_id,
+                     std::string version_uuid,
                      const GURL& scope,
                      const GURL& script,
                      bool pause_after_download) override {
     if (pause_after_download) {
       // Evict the incumbent worker.
-      ServiceWorkerVersion* version = context()->GetLiveVersion(version_id);
+      ServiceWorkerVersion* version = context()->GetLiveVersion(version_uuid);
       ASSERT_TRUE(version);
       ServiceWorkerRegistration* registration =
           context()->GetLiveRegistration(version->registration_id());
       ASSERT_TRUE(registration);
       ASSERT_TRUE(registration->active_version());
       ASSERT_FALSE(registration->waiting_version());
       registration->DeleteVersion(
           make_scoped_refptr(registration->active_version()));
     }
-    UpdateJobTestHelper::OnStartWorker(embedded_worker_id, version_id, scope,
+    UpdateJobTestHelper::OnStartWorker(embedded_worker_id, version_uuid, scope,
                                        script, pause_after_download);
   }
 
   void OnRegistrationFailed(ServiceWorkerRegistration* registration) override {
     registration_failed_ = true;
   }
 
   bool registration_failed_ = false;
 };
 
@@ skipping 24 matching lines @@
   first_version->StartUpdate();
   base::RunLoop().RunUntilIdle();
 
   // Verify results.
   ASSERT_TRUE(registration->active_version());
   EXPECT_EQ(first_version.get(), registration->active_version());
   EXPECT_FALSE(registration->installing_version());
   EXPECT_FALSE(registration->waiting_version());
   EXPECT_TRUE(update_helper->attribute_change_log_.empty());
   ASSERT_EQ(1u, update_helper->state_change_log_.size());
-  EXPECT_NE(registration->active_version()->version_id(),
-            update_helper->state_change_log_[0].version_id);
+  EXPECT_NE(registration->active_version()->version_uuid(),
+            update_helper->state_change_log_[0].version_uuid);
   EXPECT_EQ(ServiceWorkerVersion::REDUNDANT,
             update_helper->state_change_log_[0].status);
   EXPECT_FALSE(update_helper->update_found_);
 }
 
 TEST_F(ServiceWorkerJobTest, Update_NewVersion) {
   UpdateJobTestHelper* update_helper =
       new UpdateJobTestHelper(render_process_id_);
   helper_.reset(update_helper);
   scoped_refptr<ServiceWorkerRegistration> registration =
@@ skipping 13 matching lines @@
   EXPECT_NE(first_version.get(), registration->active_version());
   EXPECT_FALSE(registration->installing_version());
   EXPECT_FALSE(registration->waiting_version());
   ASSERT_EQ(3u, update_helper->attribute_change_log_.size());
 
   UpdateJobTestHelper::AttributeChangeLogEntry entry;
   entry = update_helper->attribute_change_log_[0];
   EXPECT_TRUE(entry.mask.installing_changed());
   EXPECT_FALSE(entry.mask.waiting_changed());
   EXPECT_FALSE(entry.mask.active_changed());
-  EXPECT_NE(entry.info.installing_version.version_id,
-            kInvalidServiceWorkerVersionId);
-  EXPECT_EQ(entry.info.waiting_version.version_id,
-            kInvalidServiceWorkerVersionId);
-  EXPECT_NE(entry.info.active_version.version_id,
-            kInvalidServiceWorkerVersionId);
+  EXPECT_FALSE(entry.info.installing_version.version_uuid.empty());
+  EXPECT_TRUE(entry.info.waiting_version.version_uuid.empty());
+  EXPECT_FALSE(entry.info.active_version.version_uuid.empty());
 
   entry = update_helper->attribute_change_log_[1];
   EXPECT_TRUE(entry.mask.installing_changed());
   EXPECT_TRUE(entry.mask.waiting_changed());
   EXPECT_FALSE(entry.mask.active_changed());
-  EXPECT_EQ(entry.info.installing_version.version_id,
-            kInvalidServiceWorkerVersionId);
-  EXPECT_NE(entry.info.waiting_version.version_id,
-            kInvalidServiceWorkerVersionId);
-  EXPECT_NE(entry.info.active_version.version_id,
-            kInvalidServiceWorkerVersionId);
+  EXPECT_TRUE(entry.info.installing_version.version_uuid.empty());
+  EXPECT_FALSE(entry.info.waiting_version.version_uuid.empty());
+  EXPECT_FALSE(entry.info.active_version.version_uuid.empty());
 
   entry = update_helper->attribute_change_log_[2];
   EXPECT_FALSE(entry.mask.installing_changed());
   EXPECT_TRUE(entry.mask.waiting_changed());
   EXPECT_TRUE(entry.mask.active_changed());
-  EXPECT_EQ(entry.info.installing_version.version_id,
-            kInvalidServiceWorkerVersionId);
-  EXPECT_EQ(entry.info.waiting_version.version_id,
-            kInvalidServiceWorkerVersionId);
-  EXPECT_NE(entry.info.active_version.version_id,
-            kInvalidServiceWorkerVersionId);
+  EXPECT_TRUE(entry.info.installing_version.version_uuid.empty());
+  EXPECT_TRUE(entry.info.waiting_version.version_uuid.empty());
+  EXPECT_FALSE(entry.info.active_version.version_uuid.empty());
 
   // expected version state transitions:
   // new.installing, new.installed,
   // old.redundant,
   // new.activating, new.activated
   ASSERT_EQ(5u, update_helper->state_change_log_.size());
 
-  EXPECT_EQ(registration->active_version()->version_id(),
-            update_helper->state_change_log_[0].version_id);
+  EXPECT_EQ(registration->active_version()->version_uuid(),
+            update_helper->state_change_log_[0].version_uuid);
   EXPECT_EQ(ServiceWorkerVersion::INSTALLING,
             update_helper->state_change_log_[0].status);
 
-  EXPECT_EQ(registration->active_version()->version_id(),
-            update_helper->state_change_log_[1].version_id);
+  EXPECT_EQ(registration->active_version()->version_uuid(),
+            update_helper->state_change_log_[1].version_uuid);
   EXPECT_EQ(ServiceWorkerVersion::INSTALLED,
             update_helper->state_change_log_[1].status);
 
-  EXPECT_EQ(first_version->version_id(),
-            update_helper->state_change_log_[2].version_id);
+  EXPECT_EQ(first_version->version_uuid(),
+            update_helper->state_change_log_[2].version_uuid);
   EXPECT_EQ(ServiceWorkerVersion::REDUNDANT,
             update_helper->state_change_log_[2].status);
 
-  EXPECT_EQ(registration->active_version()->version_id(),
-            update_helper->state_change_log_[3].version_id);
+  EXPECT_EQ(registration->active_version()->version_uuid(),
+            update_helper->state_change_log_[3].version_uuid);
   EXPECT_EQ(ServiceWorkerVersion::ACTIVATING,
             update_helper->state_change_log_[3].status);
 
-  EXPECT_EQ(registration->active_version()->version_id(),
-            update_helper->state_change_log_[4].version_id);
+  EXPECT_EQ(registration->active_version()->version_uuid(),
+            update_helper->state_change_log_[4].version_uuid);
   EXPECT_EQ(ServiceWorkerVersion::ACTIVATED,
             update_helper->state_change_log_[4].status);
 
   EXPECT_TRUE(update_helper->update_found_);
 }
 
 TEST_F(ServiceWorkerJobTest, Update_NewestVersionChanged) {
   scoped_refptr<ServiceWorkerRegistration> registration =
       RunRegisterJob(GURL("http://www.example.com/one/"),
                      GURL("http://www.example.com/service_worker.js"));
 
   ServiceWorkerVersion* active_version = registration->active_version();
 
   // Queue an Update, it should abort when it starts and sees the new version.
   job_coordinator()->Update(registration.get(), false);
 
   // Add a waiting version with new script.
-  scoped_refptr<ServiceWorkerVersion> version =
-      new ServiceWorkerVersion(registration.get(),
-                               GURL("http://www.example.com/new_worker.js"),
-                               2L /* dummy version id */,
-                               helper_->context()->AsWeakPtr());
+  scoped_refptr<ServiceWorkerVersion> version = new ServiceWorkerVersion(
+      registration.get(), GURL("http://www.example.com/new_worker.js"),
+      std::string(
+          "03fdbf6e-61b6-476a-9379-11d172ade44b") /* dummy version id */,
+      helper_->context()->AsWeakPtr());
   registration->SetWaitingVersion(version);
 
   base::RunLoop().RunUntilIdle();
 
   // Verify the registration was not modified by the Update.
   EXPECT_EQ(active_version, registration->active_version());
   EXPECT_EQ(version.get(), registration->waiting_version());
   EXPECT_EQ(NULL, registration->installing_version());
 }
 
@@ skipping 383 matching lines @@
   EXPECT_FALSE(registration->is_uninstalling());
   EXPECT_FALSE(registration->is_uninstalled());
 
   EXPECT_EQ(ServiceWorkerVersion::STOPPED, old_version->running_status());
   EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, old_version->status());
 
   FindRegistrationForPattern(pattern, SERVICE_WORKER_OK);
 }
 
 }  // namespace content