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

content/browser/service_worker/service_worker_write_to_cache_job_unittest.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/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/browser/fileapi/mock_url_request_delegate.h"
 #include "content/browser/service_worker/embedded_worker_test_helper.h"
@@ skipping 66 matching lines @@
       "Expires: Thu, 1 Jan 2100 20:00:00 GMT\0"
       "\0";
   return new net::URLRequestTestJob(
       request,
       network_delegate,
       std::string(kPlainTextHeaders, arraysize(kPlainTextHeaders)),
       kScriptCode,
       true);
 }
 
+net::URLRequestJob* CreateErrorReponseJob(
+    net::URLRequest* request,
+    net::NetworkDelegate* network_delegate) {
+  const char kErrorHeaders[] =
+      "HTTP/1.1 404 Not Found\0"
+      "\0";

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

nit: These lines could be squashed into line 90.

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

Done.

+  return new net::URLRequestTestJob(
+      request, network_delegate,
+      std::string(kErrorHeaders, arraysize(kErrorHeaders)), kScriptCode, true);
+}
+
 class SSLCertificateErrorJob : public net::URLRequestTestJob {
  public:
   SSLCertificateErrorJob(net::URLRequest* request,
                          net::NetworkDelegate* network_delegate,
                          const std::string& response_headers,
                          const std::string& response_data,
                          bool auto_advance)
       : net::URLRequestTestJob(request,
                                network_delegate,
                                response_headers,
@@ skipping 256 matching lines @@
     return incumbent_resource_id;
   }
 
   int GetResourceId(ServiceWorkerVersion* version) {
     return version->script_cache_map()->LookupResourceId(script_url_);
   }
 
   // Performs the net request for an update of |registration_|'s incumbent
   // to the script |response|. Returns the new version.
   scoped_refptr<ServiceWorkerVersion> UpdateScript(
-      const std::string& response) {
+      const std::string& response,
+      bool status_success = true,
+      bool network_accessed = true) {
     int render_process_id = NextRenderProcessId();
     int provider_id = NextProviderId();
     scoped_refptr<ServiceWorkerVersion> new_version =
         new ServiceWorkerVersion(registration_.get(), script_url_,
                                  NextVersionId(), context()->AsWeakPtr());
     CreateHostForVersion(render_process_id, provider_id, new_version);
 
     SetUpScriptRequest(render_process_id, provider_id);
-    mock_protocol_handler_->SetCreateJobCallback(
-        base::Bind(&CreateResponseJob, response));
+    if (status_success)
+      mock_protocol_handler_->SetCreateJobCallback(
+          base::Bind(&CreateResponseJob, response));
+    else
+      mock_protocol_handler_->SetCreateJobCallback(
+          base::Bind(&CreateErrorReponseJob));
+    // Whether the script load request accessed the network or was served from
+    // HTTPCache.
+    if (network_accessed)
+      new_version->embedded_worker()->OnNetworkAccessedForScriptLoad();

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

This might not be necessary after incorporating my comment on
service_worker_write_to_cache_job.cc ??

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

Yes, this part has been removed.

     request_->Start();
     base::RunLoop().RunUntilIdle();
     return new_version;
   }
 
   void VerifyResource(int id, const std::string& expected) {
     ASSERT_NE(kInvalidServiceWorkerResourceId, id);
     bool is_equal = false;
     scoped_ptr<ServiceWorkerResponseReader> reader =
         context()->storage()->CreateResponseReader(id);
@@ skipping 182 matching lines @@
   // Update from non-empty to empty.
   version = UpdateScript(std::string());
   VerifyResource(GetResourceId(version.get()), std::string());
   registration_->SetWaitingVersion(version);
 
   // Update from empty to empty.
   version = UpdateScript(std::string());
   EXPECT_EQ(kInvalidServiceWorkerResponseId, GetResourceId(version.get()));
 }
 
+TEST_F(ServiceWorkerWriteToCacheJobTest, Update_BumpLastUpdateCheckTime) {
+  std::string response = GenerateLongResponse();
+  CreateIncumbent(response);
+
+  // Script was served from HTTPCache.
+  base::Time current = base::Time::Now();
+  registration_->set_last_update_check(current);
+  scoped_refptr<ServiceWorkerVersion> version = UpdateScript(
+      response, true /* status_success */, false /* network_accessed */);
+  EXPECT_EQ(current, registration_->last_update_check());
+
+  // Same script but the request accessed the network.
+  version = UpdateScript(response);
+  EXPECT_LT(current, registration_->last_update_check());
+
+  // Changed the first byte and the request accessed the network.
+  response[0] = 'x';
+  current = base::Time::Now();
+  registration_->set_last_update_check(current);
+  version = UpdateScript(response);
+  VerifyResource(GetResourceId(version.get()), response);
+  registration_->SetWaitingVersion(version);
+  EXPECT_LT(current, registration_->last_update_check());
+
+  // The request accessed the network but received a non-2xx error.
+  current = base::Time::Now();
+  registration_->set_last_update_check(current);
+  version = UpdateScript(response, false /* status_success */);
+  EXPECT_EQ(current, registration_->last_update_check());
+}
+
 }  // namespace content