Removing redundant 'is_null' field in ServiceWorkerVersionInfo

content/browser/service_worker/service_worker_browsertest.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/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
@@ skipping 224 matching lines @@
     int* num_resources) {
   *num_resources = -1;
 
   std::vector<ServiceWorkerRegistrationInfo> infos =
      wrapper->context()->GetAllLiveRegistrationInfo();
   if (infos.empty())
     return;
 
   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;
 
   ServiceWorkerVersion* version =
       wrapper->context()->GetLiveVersion(version_id);
   *num_resources = static_cast<int>(version->script_cache_map()->size());
 }
 
 }  // namespace
@@ skipping 678 matching lines @@
     RunOnIOThread(
         base::Bind(&ServiceWorkerBlackBoxBrowserTest::FindRegistrationOnIO,
                    this,
                    embedded_test_server()->GetURL("/service_worker/empty.html"),
                    &status));
     EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND, status);
   }
 }
 
 }  // namespace content