ServiceWorker: SWRegisterJob should manage status of SWVersion

content/browser/service_worker/service_worker_context_request_handler.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 "content/browser/service_worker/service_worker_context_request_handler.h"
 
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_read_from_cache_job.h"
 #include "content/browser/service_worker/service_worker_storage.h"
@@ skipping 57 matching lines @@
         request, network_delegate, context_, response_id);
   }
 
   // NULL means use the network.
   return NULL;
 }
 
 bool ServiceWorkerContextRequestHandler::ShouldAddToScriptCache(
     const GURL& url) {
   // We only write imports that occur during the initial eval.
-  if (version_->status() != ServiceWorkerVersion::NEW)
+  if (version_->status() != ServiceWorkerVersion::NEW &&
+      version_->status() != ServiceWorkerVersion::INSTALLING) {

[falken, 2014/07/07 07:05:16]

I'm curious whether this can be more restrictive? Do we expect to get here when
the version is status NEW?

[nhiroki, 2014/07/07 08:26:41]

I think the both are necessary. Normally the version's status is NEW here, but
it can be INSTALLING if the worker hasn't been running on
ServiceWorkerVersion::DispatchInstallEvent() (see my inline comment there).

     return false;
+  }
   return version_->script_cache_map()->Lookup(url) ==
             kInvalidServiceWorkerResponseId;
 }
 
 bool ServiceWorkerContextRequestHandler::ShouldReadFromScriptCache(
     const GURL& url, int64* response_id_out) {
   // We don't read from the script cache until the version is INSTALLED.
   if (version_->status() == ServiceWorkerVersion::NEW ||
       version_->status() == ServiceWorkerVersion::INSTALLING)
     return false;
   *response_id_out = version_->script_cache_map()->Lookup(url);
   return *response_id_out != kInvalidServiceWorkerResponseId;
 }
 
 }  // namespace content