Service Worker: Change last update check location and HTTP cache bypass rule (2/2)

content/browser/service_worker/service_worker_write_to_cache_job.cc

Index: content/browser/service_worker/service_worker_write_to_cache_job.cc
diff --git a/content/browser/service_worker/service_worker_write_to_cache_job.cc b/content/browser/service_worker/service_worker_write_to_cache_job.cc
index 781a65257b61f1371eb8eaa703cdae73565c3dd0..0d7f33a78b58887aa8d968541e3bbbe901281b01 100644
--- a/content/browser/service_worker/service_worker_write_to_cache_job.cc
+++ b/content/browser/service_worker/service_worker_write_to_cache_job.cc
@@ -623,6 +623,13 @@ void ServiceWorkerWriteToCacheJob::OnBeforeNetworkStart(
 void ServiceWorkerWriteToCacheJob::OnResponseStarted(
     net::URLRequest* request) {
   DCHECK_EQ(net_request_, request);
+  if (!context_) {
+    AsyncNotifyDoneHelper(
+        net::URLRequestStatus(net::URLRequestStatus::FAILED, net::ERR_FAILED),
+        kFetchScriptError);
+    return;
+  }
+
   if (!request->status().is_success()) {
     AsyncNotifyDoneHelper(request->status(), kFetchScriptError);
     return;
@@ -637,6 +644,18 @@ void ServiceWorkerWriteToCacheJob::OnResponseStarted(
     // response to our consumer, just don't cache it?
     return;
   }
+
+  // Update |last_update_check| only when the request bypassed the browser
+  // cache.
+  if (version_->embedded_worker()->network_accessed_for_script()) {

[nhiroki, 2015/09/07 07:05:59]

This seems always false because |OnNetworkAccessedForScriptLoad| is called after
this line (line 695). Maybe we can replace |network_accessed_for_script()| with
|net_request_->response_info().network_accessed| (see line 694) and remove the
function.

[jungkees, 2015/09/08 16:01:13]

Thanks for spotting this! I replaced the condition with
|net_request_->response_info().network_accessed| and removed
|network_accessed_for_script()|, and updated the
service_worker_write_to_cache_job_unittest.cc to satisfy this change.

+    ServiceWorkerRegistration* registration =
+        context_->GetLiveRegistration(version_->registration_id());
+    DCHECK(registration);  // We're registering or updating so must be there.
+
+    registration->set_last_update_check(base::Time::Now());
+    context_->storage()->UpdateLastUpdateCheckTime(registration);
+  }
+
   // OnSSLCertificateError is not called when the HTTPS connection is reused.
   // So we check cert_status here.
   if (net::IsCertStatusError(request->ssl_info().cert_status)) {