[2/3 chromium] Support redirect option of Request and "opaqueredirect" response type.

content/browser/service_worker/service_worker_controllee_request_handler.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 "content/browser/service_worker/service_worker_controllee_request_handler.h"
 
 #include "base/trace_event/trace_event.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_metrics.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
@@ skipping 10 matching lines @@
 #include "net/url_request/url_request.h"
 
 namespace content {
 
 ServiceWorkerControlleeRequestHandler::ServiceWorkerControlleeRequestHandler(
     base::WeakPtr<ServiceWorkerContextCore> context,
     base::WeakPtr<ServiceWorkerProviderHost> provider_host,
     base::WeakPtr<storage::BlobStorageContext> blob_storage_context,
     FetchRequestMode request_mode,
     FetchCredentialsMode credentials_mode,
+    FetchRedirectMode redirect_mode,
     ResourceType resource_type,
     RequestContextType request_context_type,
     RequestContextFrameType frame_type,
     scoped_refptr<ResourceRequestBody> body)
     : ServiceWorkerRequestHandler(context,
                                   provider_host,
                                   blob_storage_context,
                                   resource_type),
       is_main_resource_load_(
           ServiceWorkerUtils::IsMainResourceType(resource_type)),
       request_mode_(request_mode),
       credentials_mode_(credentials_mode),
+      redirect_mode_(redirect_mode),
       request_context_type_(request_context_type),
       frame_type_(frame_type),
       body_(body),
       skip_service_worker_(false),
       weak_factory_(this) {}
 
 ServiceWorkerControlleeRequestHandler::
     ~ServiceWorkerControlleeRequestHandler() {
   // Navigation triggers an update to occur shortly after the page and
   // its initial subresources load.
@@ skipping 36 matching lines @@
   if ((job_.get() && job_->ShouldFallbackToNetwork()) || skip_service_worker_) {
     FallbackToNetwork();
     return NULL;
   }
 
   // It's for original request (A) or redirect case (B-a or B-b).
   DCHECK(!job_.get() || job_->ShouldForwardToServiceWorker());
 
   job_ = new ServiceWorkerURLRequestJob(
       request, network_delegate, provider_host_, blob_storage_context_,
-      resource_context, request_mode_, credentials_mode_,
+      resource_context, request_mode_, credentials_mode_, redirect_mode_,
       is_main_resource_load_, request_context_type_, frame_type_, body_);
   resource_context_ = resource_context;
 
   if (is_main_resource_load_)
     PrepareForMainResource(request);
   else
     PrepareForSubResource();
 
   if (job_->ShouldFallbackToNetwork()) {
     // If we know we can fallback to network at this point (in case
@@ skipping 166 matching lines @@
 void ServiceWorkerControlleeRequestHandler::FallbackToNetwork() {
   // Once a subresource request was fallbacked to the network, we set
   // |skip_service_worker_| because the request should not go to the service
   // worker.
   if (!is_main_resource_load_)
     skip_service_worker_ = true;
   job_ = NULL;
 }
 
 }  // namespace content