Removing redundant 'is_null' field in ServiceWorkerVersionInfo

content/browser/service_worker/service_worker_registration_unittest.cc

 // Copyright 2013 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 "content/browser/service_worker/service_worker_registration.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 102 matching lines @@
   registration->AddListener(&listener);
   registration->SetActiveVersion(version_1.get());
 
   EXPECT_EQ(version_1.get(), registration->active_version());
   EXPECT_EQ(registration, listener.observed_registration_);
   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(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());
 
   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_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());
 
   EXPECT_EQ(version_2.get(), registration->waiting_version());
   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_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());
 
   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_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) {
   const GURL kScope("http://www.example.not/");
   int64 kRegistrationId = 1L;
   int kProviderId = 1;
   scoped_refptr<ServiceWorkerRegistration> registration =
       new ServiceWorkerRegistration(
           kScope,
           kRegistrationId,
           context_ptr_);
   scoped_ptr<ServiceWorkerRegistrationHandle> handle(
       new ServiceWorkerRegistrationHandle(context_ptr_,
                                           NULL,
                                           kProviderId,
                                           registration.get()));
   registration->NotifyRegistrationFailed();
   // Don't crash when handle gets destructed.
 }
 
 }  // namespace content