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

content/browser/service_worker/service_worker_version.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_version.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 518 matching lines @@
     ServiceWorkerRegistration* registration,
     const GURL& script_url,
     int64 version_id,
     base::WeakPtr<ServiceWorkerContextCore> context)
     : version_id_(version_id),
       registration_id_(registration->id()),
       script_url_(script_url),
       scope_(registration->pattern()),
       context_(context),
       script_cache_map_(this, context),
+      max_age_(base::TimeDelta::FromSeconds(
+          kServiceWorkerScriptMaxCacheAgeInSeconds)),
       ping_controller_(new PingController(this)),
       weak_factory_(this) {
   DCHECK(context_);
   DCHECK(registration);
   context_->AddLiveVersion(this);
   embedded_worker_ = context_->embedded_worker_registry()->CreateWorker();
   embedded_worker_->AddListener(this);
 }
 
 ServiceWorkerVersion::~ServiceWorkerVersion() {
@@ skipping 1659 matching lines @@
   if (!context_)
     return;
   if (update_timer_.IsRunning() || !stale_time_.is_null())
     return;
   ServiceWorkerRegistration* registration =
       context_->GetLiveRegistration(registration_id_);
   if (!registration || registration->active_version() != this)
     return;
   base::TimeDelta time_since_last_check =
       base::Time::Now() - registration->last_update_check();
-  if (time_since_last_check >
-      base::TimeDelta::FromHours(kServiceWorkerScriptMaxCacheAgeInHours))
+  if (time_since_last_check > max_age())

[jungkees, 2015/08/20 01:52:56]

I think this line of codes seems still need the concept of the service worker's
max age for scheduled updates? In my understanding, we now consider
min(Cache-Control: max-age's value, 86400) as the desired lifetime of the
service worker. I'm not sure if we still have other ways to attain this instead
of storing/using max-age.

     RestartTick(&stale_time_);
 }
 
 void ServiceWorkerVersion::FoundRegistrationForUpdate(
     ServiceWorkerStatusCode status,
     const scoped_refptr<ServiceWorkerRegistration>& registration) {
   if (!context_)
     return;
 
   const scoped_refptr<ServiceWorkerVersion> protect = this;
@@ skipping 70 matching lines @@
                     base::string16());
   service_port_dispatcher_.reset();
 }
 
 void ServiceWorkerVersion::OnBackgroundSyncDispatcherConnectionError() {
   RunIDMapCallbacks(&sync_requests_, SERVICE_WORKER_ERROR_FAILED);
   background_sync_dispatcher_.reset();
 }
 
 }  // namespace content