Removing redundant 'is_null' field in ServiceWorkerVersionInfo

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 1050 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_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,
   // 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(ServiceWorkerVersion::INSTALLING,
@@ skipping 87 matching lines @@
   EXPECT_TRUE(called);
 
   // Verify the registration was not modified by the Update.
   EXPECT_TRUE(registration->is_uninstalling());
   EXPECT_EQ(active_version, registration->active_version());
   EXPECT_EQ(NULL, registration->waiting_version());
   EXPECT_EQ(NULL, registration->installing_version());
 }
 
 }  // namespace content