network service: Add job wrapper to SWControlleeRequestHandler

content/browser/service_worker/service_worker_controllee_request_handler.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTROLLEE_REQUEST_HANDLER_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTROLLEE_REQUEST_HANDLER_H_
 
 #include <stdint.h>
 
 #include "base/gtest_prod_util.h"
@@ skipping 11 matching lines @@
 #include "url/gurl.h"
 
 namespace net {
 class NetworkDelegate;
 class URLRequest;
 }
 
 namespace content {
 
 class ResourceRequestBodyImpl;
+class ServiceWorkerURLJobWrapper;
 class ServiceWorkerRegistration;
 class ServiceWorkerVersion;
 
 // A request handler derivative used to handle requests from
 // controlled documents.
 class CONTENT_EXPORT ServiceWorkerControlleeRequestHandler
     : public ServiceWorkerRequestHandler,
       public ServiceWorkerURLRequestJob::Delegate {
  public:
   ServiceWorkerControlleeRequestHandler(
@@ skipping 14 matching lines @@
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate,
       ResourceContext* resource_context) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerControlleeRequestHandlerTest,
                            ActivateWaitingVersion);
   typedef ServiceWorkerControlleeRequestHandler self;
 
   // For main resource case.
-  void PrepareForMainResource(const net::URLRequest* request);
+  void PrepareForMainResource(const GURL& url,
+                              const GURL& first_party_for_cookies);
   void DidLookupRegistrationForMainResource(
       ServiceWorkerStatusCode status,
       scoped_refptr<ServiceWorkerRegistration> registration);
   void OnVersionStatusChanged(
       ServiceWorkerRegistration* registration,
       ServiceWorkerVersion* version);
 
   void DidUpdateRegistration(
       const scoped_refptr<ServiceWorkerRegistration>& original_registration,
       ServiceWorkerStatusCode status,
@@ skipping 15 matching lines @@
   ServiceWorkerVersion* GetServiceWorkerVersion(
       ServiceWorkerMetrics::URLRequestJobResult* result) override;
   bool RequestStillValid(
       ServiceWorkerMetrics::URLRequestJobResult* result) override;
   void MainResourceLoadFailed() override;
 
   // Sets |job_| to nullptr, and clears all extra response info associated with
   // that job, except for timing information.
   void ClearJob();
 
+  bool JobWasCanceled() const;
+
   const bool is_main_resource_load_;
   const bool is_main_frame_load_;
-  base::WeakPtr<ServiceWorkerURLRequestJob> job_;
+  std::unique_ptr<ServiceWorkerURLJobWrapper> url_job_;
   FetchRequestMode request_mode_;
   FetchCredentialsMode credentials_mode_;
   FetchRedirectMode redirect_mode_;
   RequestContextType request_context_type_;
   RequestContextFrameType frame_type_;
   scoped_refptr<ResourceRequestBodyImpl> body_;
   ResourceContext* resource_context_;
   GURL stripped_url_;
   bool force_update_started_;
 
   // True if the next time this request is started, the response should be
   // delivered from the network, bypassing the ServiceWorker. Cleared after the
   // next intercept opportunity, for main frame requests.
   bool use_network_;
 
   base::WeakPtrFactory<ServiceWorkerControlleeRequestHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerControlleeRequestHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTROLLEE_REQUEST_HANDLER_H_