Add support for fallback content for the frame. This includes main and subframes.

content/browser/service_worker/service_worker_url_loader_job.cc

 // Copyright 2017 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_url_loader_job.h"
 
 #include "base/strings/stringprintf.h"
 #include "content/browser/blob_storage/blob_url_loader_factory.h"
 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
 #include "content/browser/service_worker/service_worker_version.h"
@@ skipping 25 matching lines @@
 
 ServiceWorkerURLLoaderJob::~ServiceWorkerURLLoaderJob() {}
 
 void ServiceWorkerURLLoaderJob::FallbackToNetwork() {
   response_type_ = FALLBACK_TO_NETWORK;
   // This could be called multiple times in some cases because we simply
   // call this synchronously here and don't wait for a separate async
   // StartRequest cue like what URLRequestJob case does.
   // TODO(kinuko): Make sure this is ok or we need to make this async.
   if (!loader_callback_.is_null())
-    std::move(loader_callback_).Run(StartLoaderCallback());
+    std::move(loader_callback_).Run(StartLoaderCallback(), ResponseFallback());
 }
 
 void ServiceWorkerURLLoaderJob::FallbackToNetworkOrRenderer() {
   // TODO(kinuko): Implement this. Now we always fallback to network.
   FallbackToNetwork();
 }
 
 void ServiceWorkerURLLoaderJob::ForwardToServiceWorker() {
   response_type_ = FORWARD_TO_SERVICE_WORKER;
   StartRequest();
@@ skipping 187 matching lines @@
     DeliverErrorResponse();
     return;
   }
 
   // Creates a new HttpResponseInfo using the the ServiceWorker script's
   // HttpResponseInfo to show HTTPS padlock.
   // TODO(horo): When we support mixed-content (HTTP) no-cors requests from a
   // ServiceWorker, we have to check the security level of the responses.
   const net::HttpResponseInfo* main_script_http_info =
       version->GetMainScriptHttpResponseInfo();
-  DCHECK(main_script_http_info);
-  ssl_info_ = main_script_http_info->ssl_info;
+  if (main_script_http_info)

[ananta, 2017/07/27 02:40:25]

Was hitting this DCHECK and the subsequent crash later on. Please check if this
change is ok.

[kinuko, 2017/07/27 13:46:27]

This should be fixed by my other change-
https://chromium-review.googlesource.com/c/584551/

If this doesn't break any other tests I prefer having the DCHECK as is
(otherwise could you put "TODO(kinuko): fix this" here)?

+    ssl_info_ = main_script_http_info->ssl_info;
 
   std::move(loader_callback_)
       .Run(base::Bind(&ServiceWorkerURLLoaderJob::StartResponse,
                       weak_factory_.GetWeakPtr(), response,
-                      base::Passed(std::move(body_as_stream))));
+                      base::Passed(std::move(body_as_stream))),
+           ResponseFallback());
 }
 
 void ServiceWorkerURLLoaderJob::StartResponse(
     const ServiceWorkerResponse& response,
     blink::mojom::ServiceWorkerStreamHandlePtr body_as_stream,
     mojom::URLLoaderRequest request,
     mojom::URLLoaderClientPtr client) {
   DCHECK(!binding_.is_bound());
   binding_.Bind(std::move(request));
   binding_.set_connection_error_handler(
@@ skipping 86 matching lines @@
 }
 
 void ServiceWorkerURLLoaderJob::OnComplete(
     const ResourceRequestCompletionStatus& status) {
   DCHECK_EQ(Status::kSentHeader, status_);
   status_ = Status::kCompleted;
   url_loader_client_->OnComplete(status);
 }
 
 }  // namespace content