Removing redundant 'is_null' field in ServiceWorkerVersionInfo

Removing 'is_null' from ServiceWorkerVersionInfo in favor of
comparing the version_id to kInvalidServiceWorker.

BUG=428488

Review URL: https://codereview.chromium.org/691413002

Cr-Commit-Position: refs/heads/master@{#302243}

content/browser/service_worker/service_worker_browsertest.cc

@@ -242,11 +242,14 @@ void CountScriptResources(
 
   int version_id;
   size_t index = infos.size() - 1;
-  if (!infos[index].installing_version.is_null)
+  if (infos[index].installing_version.version_id !=
+      kInvalidServiceWorkerVersionId)
     version_id = infos[index].installing_version.version_id;
-  else if (!infos[index].waiting_version.is_null)
+  else if (infos[index].waiting_version.version_id !=
+           kInvalidServiceWorkerVersionId)
     version_id = infos[1].waiting_version.version_id;
-  else if (!infos[index].active_version.is_null)
+  else if (infos[index].active_version.version_id !=
+           kInvalidServiceWorkerVersionId)
     version_id = infos[index].active_version.version_id;
   else
     return;

content/browser/service_worker/service_worker_info.cc

@@ -10,8 +10,7 @@
 namespace content {
 
 ServiceWorkerVersionInfo::ServiceWorkerVersionInfo()
-    : is_null(true),
-      running_status(ServiceWorkerVersion::STOPPED),
+    : running_status(ServiceWorkerVersion::STOPPED),
       status(ServiceWorkerVersion::NEW),
       version_id(kInvalidServiceWorkerVersionId),
       process_id(-1),
@@ -27,8 +26,7 @@ ServiceWorkerVersionInfo::ServiceWorkerVersionInfo(
     int process_id,
     int thread_id,
     int devtools_agent_route_id)
-    : is_null(false),
-      running_status(running_status),
+    : running_status(running_status),
       status(status),
       script_url(script_url),
       version_id(version_id),

content/browser/service_worker/service_worker_info.h

@@ -25,7 +25,6 @@ class CONTENT_EXPORT ServiceWorkerVersionInfo {
                            int devtools_agent_route_id);
   ~ServiceWorkerVersionInfo();
 
-  bool is_null;
   ServiceWorkerVersion::RunningStatus running_status;
   ServiceWorkerVersion::Status status;
   GURL script_url;

content/browser/service_worker/service_worker_internals_ui.cc

@@ -216,13 +216,15 @@ ListValue* GetRegistrationListValue(
     registration_info->SetString(
         "registration_id", base::Int64ToString(registration.registration_id));
 
-    if (!registration.active_version.is_null) {
+    if (registration.active_version.version_id !=
+        kInvalidServiceWorkerVersionId) {
       DictionaryValue* active_info = new DictionaryValue();
       UpdateVersionInfo(registration.active_version, active_info);
       registration_info->Set("active", active_info);
     }
 
-    if (!registration.waiting_version.is_null) {
+    if (registration.waiting_version.version_id !=
+        kInvalidServiceWorkerVersionId) {
       DictionaryValue* waiting_info = new DictionaryValue();
       UpdateVersionInfo(registration.waiting_version, waiting_info);
       registration_info->Set("waiting", waiting_info);

content/browser/service_worker/service_worker_job_unittest.cc

@@ -1068,25 +1068,34 @@ TEST_F(ServiceWorkerJobTest, Update_NewVersion) {
   EXPECT_TRUE(entry.mask.installing_changed());
   EXPECT_FALSE(entry.mask.waiting_changed());
   EXPECT_FALSE(entry.mask.active_changed());
-  EXPECT_FALSE(entry.info.installing_version.is_null);
-  EXPECT_TRUE(entry.info.waiting_version.is_null);
-  EXPECT_FALSE(entry.info.active_version.is_null);
+  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);
 
   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_TRUE(entry.info.installing_version.is_null);
-  EXPECT_FALSE(entry.info.waiting_version.is_null);
-  EXPECT_FALSE(entry.info.active_version.is_null);
+  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);
 
   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_TRUE(entry.info.installing_version.is_null);
-  EXPECT_TRUE(entry.info.waiting_version.is_null);
-  EXPECT_FALSE(entry.info.active_version.is_null);
+  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);
 
   // expected version state transitions:
   // new.installing, new.installed,

content/browser/service_worker/service_worker_registration_unittest.cc

@@ -120,9 +120,12 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
   EXPECT_EQ(kScope, listener.observed_info_.pattern);
   EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
   EXPECT_EQ(kScript, listener.observed_info_.active_version.script_url);
-  EXPECT_TRUE(listener.observed_info_.installing_version.is_null);
-  EXPECT_TRUE(listener.observed_info_.waiting_version.is_null);
-  EXPECT_TRUE(listener.observed_info_.controlling_version.is_null);
+  EXPECT_EQ(listener.observed_info_.installing_version.version_id,
+            kInvalidServiceWorkerVersionId);
+  EXPECT_EQ(listener.observed_info_.waiting_version.version_id,
+            kInvalidServiceWorkerVersionId);
+  EXPECT_EQ(listener.observed_info_.controlling_version.version_id,
+            kInvalidServiceWorkerVersionId);
   listener.Reset();
 
   registration->SetInstallingVersion(version_2.get());
@@ -133,8 +136,10 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
   EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
   EXPECT_EQ(version_2_id,
             listener.observed_info_.installing_version.version_id);
-  EXPECT_TRUE(listener.observed_info_.waiting_version.is_null);
-  EXPECT_TRUE(listener.observed_info_.controlling_version.is_null);
+  EXPECT_EQ(listener.observed_info_.waiting_version.version_id,
+            kInvalidServiceWorkerVersionId);
+  EXPECT_EQ(listener.observed_info_.controlling_version.version_id,
+            kInvalidServiceWorkerVersionId);
   listener.Reset();
 
   registration->SetWaitingVersion(version_2.get());
@@ -145,8 +150,10 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
   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_TRUE(listener.observed_info_.installing_version.is_null);
-  EXPECT_TRUE(listener.observed_info_.controlling_version.is_null);
+  EXPECT_EQ(listener.observed_info_.installing_version.version_id,
+            kInvalidServiceWorkerVersionId);
+  EXPECT_EQ(listener.observed_info_.controlling_version.version_id,
+            kInvalidServiceWorkerVersionId);
   listener.Reset();
 
   registration->UnsetVersion(version_2.get());
@@ -155,9 +162,12 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
   EXPECT_EQ(ChangedVersionAttributesMask::WAITING_VERSION,
             listener.observed_changed_mask_.changed());
   EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
-  EXPECT_TRUE(listener.observed_info_.waiting_version.is_null);
-  EXPECT_TRUE(listener.observed_info_.installing_version.is_null);
-  EXPECT_TRUE(listener.observed_info_.controlling_version.is_null);
+  EXPECT_EQ(listener.observed_info_.waiting_version.version_id,
+            kInvalidServiceWorkerVersionId);
+  EXPECT_EQ(listener.observed_info_.installing_version.version_id,
+            kInvalidServiceWorkerVersionId);
+  EXPECT_EQ(listener.observed_info_.controlling_version.version_id,
+            kInvalidServiceWorkerVersionId);
 }
 
 TEST_F(ServiceWorkerRegistrationTest, FailedRegistrationNoCrash) {

content/browser/service_worker/service_worker_storage.cc

@@ -954,11 +954,9 @@ void ServiceWorkerStorage::DidGetAllRegistrations(
     }
 
     if (it->is_active) {
-      info.active_version.is_null = false;
       info.active_version.status = ServiceWorkerVersion::ACTIVATED;
       info.active_version.version_id = it->version_id;
     } else {
-      info.waiting_version.is_null = false;
       info.waiting_version.status = ServiceWorkerVersion::INSTALLED;
       info.waiting_version.version_id = it->version_id;
     }