service worker: Bump update time even when the script was identical

content/browser/service_worker/service_worker_register_job.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_register_job.h"
 
 #include <stdint.h>
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 339 matching lines @@
   } else {
     new_version()->set_pause_after_download(false);
   }
   new_version()->StartWorker(
       base::Bind(&ServiceWorkerRegisterJob::OnStartWorkerFinished,
                  weak_factory_.GetWeakPtr()));
 }
 
 void ServiceWorkerRegisterJob::OnStartWorkerFinished(
     ServiceWorkerStatusCode status) {
-  // Bump the last update check time only when the register/update job fetched
-  // the version having bypassed the network cache. We assume that the
-  // BYPASS_CACHE flag evicts an existing cache entry, so even if the install
-  // ultimately failed for whatever reason, we know the version in the HTTP
-  // cache is not stale, so it's OK to bump the update check time.
-  if (new_version()->embedded_worker()->network_accessed_for_script() ||
-      new_version()->force_bypass_cache_for_scripts() ||
-      registration()->last_update_check().is_null()) {
-    registration()->set_last_update_check(base::Time::Now());
-
-    if (registration()->has_installed_version())
-      context_->storage()->UpdateLastUpdateCheckTime(registration());
-  }
+  BumpLastUpdateCheckTimeIfNeeded();
 
   if (status == SERVICE_WORKER_OK) {
     InstallAndContinue();
     return;
   }
 
   // "If serviceWorker fails to start up..." then reject the promise with an
   // error and abort.
   if (status == SERVICE_WORKER_ERROR_TIMEOUT) {
     Complete(status, "Timed out while trying to start the Service Worker.");
@@ skipping 197 matching lines @@
 void ServiceWorkerRegisterJob::OnScriptLoaded() {
   DCHECK(new_version()->pause_after_download());
   new_version()->set_pause_after_download(false);
   net::URLRequestStatus status =
       new_version()->script_cache_map()->main_script_status();
   if (!status.is_success()) {
     // OnScriptLoaded signifies a successful network load, which translates into
     // a script cache error only in the byte-for-byte identical case.
     DCHECK_EQ(status.error(),
               ServiceWorkerWriteToCacheJob::kIdenticalScriptError);
+
+    BumpLastUpdateCheckTimeIfNeeded();
     ResolvePromise(SERVICE_WORKER_OK, std::string(), registration());
     Complete(SERVICE_WORKER_ERROR_EXISTS,
              "The updated worker is identical to the incumbent.");
     return;
   }
 
   new_version()->embedded_worker()->ResumeAfterDownload();
 }
 
+void ServiceWorkerRegisterJob::BumpLastUpdateCheckTimeIfNeeded() {
+  // Bump the last update check time only when the register/update job fetched
+  // the version having bypassed the network cache. We assume that the
+  // BYPASS_CACHE flag evicts an existing cache entry, so even if the install
+  // ultimately failed for whatever reason, we know the version in the HTTP
+  // cache is not stale, so it's OK to bump the update check time.
+  if (new_version()->embedded_worker()->network_accessed_for_script() ||
+      new_version()->force_bypass_cache_for_scripts() ||
+      registration()->last_update_check().is_null()) {
+    registration()->set_last_update_check(base::Time::Now());
+
+    if (registration()->has_installed_version())
+      context_->storage()->UpdateLastUpdateCheckTime(registration());
+  }
+}
+
 }  // namespace content