Reduce/Remove URLRequest dependencies from AppCacheRequestHandler

content/browser/appcache/appcache_request_handler.h

 // Copyright (c) 2011 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_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
 #define CONTENT_BROWSER_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/supports_user_data.h"
 #include "content/browser/appcache/appcache_entry.h"
 #include "content/browser/appcache/appcache_host.h"
 #include "content/browser/appcache/appcache_service_impl.h"
 #include "content/common/content_export.h"
 #include "content/public/common/resource_type.h"
 
 namespace net {
 class NetworkDelegate;
 class URLRequest;
 }  // namespace net
 
 namespace content {
+class AppCacheRequest;
 class AppCacheRequestHandlerTest;
 class AppCacheURLRequestJob;
 
 // An instance is created for each net::URLRequest. The instance survives all
 // http transactions involved in the processing of its net::URLRequest, and is
 // given the opportunity to hijack the request along the way. Callers
 // should use AppCacheHost::CreateRequestHandler to manufacture instances
 // that can retrieve resources for a particular host.
 class CONTENT_EXPORT AppCacheRequestHandler
     : public base::SupportsUserData::Data,
       public AppCacheHost::Observer,
       public AppCacheServiceImpl::Observer,
       public AppCacheStorage::Delegate {
  public:
   ~AppCacheRequestHandler() override;
 
   // These are called on each request intercept opportunity.
   AppCacheURLRequestJob* MaybeLoadResource(
-      net::URLRequest* request,
       net::NetworkDelegate* network_delegate);
   AppCacheURLRequestJob* MaybeLoadFallbackForRedirect(
-      net::URLRequest* request,
       net::NetworkDelegate* network_delegate,
       const GURL& location);
   AppCacheURLRequestJob* MaybeLoadFallbackForResponse(
-      net::URLRequest* request,
       net::NetworkDelegate* network_delegate);
 
   void GetExtraResponseInfo(int64_t* cache_id, GURL* manifest_url);
 
   // Methods to support cross site navigations.
   void PrepareForCrossSiteTransfer(int old_process_id);
   void CompleteCrossSiteTransfer(int new_process_id, int new_host_id);
   void MaybeCompleteCrossSiteTransferInOldProcess(int old_process_id);
 
   // Useful for detecting storage partition mismatches in the context
   // of cross site transfer navigations.
   bool SanityCheckIsSameService(AppCacheService* service) {
     return !host_ || (host_->service() == service);
   }
 
   static bool IsMainResourceType(ResourceType type) {
     return IsResourceTypeFrame(type) ||
            type == RESOURCE_TYPE_SHARED_WORKER;
   }
 
  private:
   friend class AppCacheHost;
 
   // Callers should use AppCacheHost::CreateRequestHandler.
-  AppCacheRequestHandler(AppCacheHost* host, ResourceType resource_type,
-                         bool should_reset_appcache);
+  AppCacheRequestHandler(AppCacheHost* host,
+                         ResourceType resource_type,
+                         bool should_reset_appcache,
+                         AppCacheRequest* request);
 
   // AppCacheHost::Observer override
   void OnDestructionImminent(AppCacheHost* host) override;
 
   // AppCacheServiceImpl::Observer override
   void OnServiceDestructionImminent(AppCacheServiceImpl* service) override;
 
   // Helpers to instruct a waiting job with what response to
   // deliver for the request we're handling.
   void DeliverAppCachedResponse(const AppCacheEntry& entry,
                                 int64_t cache_id,
                                 const GURL& manifest_url,
                                 bool is_fallback,
                                 const GURL& namespace_entry_url);
   void DeliverNetworkResponse();
   void DeliverErrorResponse();
 
   // Called just before the request is restarted. Grabs the reason for
   // restarting, so can correctly continue to handle the request.
   void OnPrepareToRestart();
 
   // Helper method to create an AppCacheURLRequestJob and populate job_.
   // Caller takes ownership of returned value.
   std::unique_ptr<AppCacheURLRequestJob> CreateJob(
-      net::URLRequest* request,
       net::NetworkDelegate* network_delegate);
 
   // Helper to retrieve a pointer to the storage object.
   AppCacheStorage* storage() const;
 
   bool is_main_resource() const {
     return IsMainResourceType(resource_type_);
   }
 
   // Main-resource loading -------------------------------------
   // Frame and SharedWorker main resources are handled here.
 
   std::unique_ptr<AppCacheURLRequestJob> MaybeLoadMainResource(
-      net::URLRequest* request,
       net::NetworkDelegate* network_delegate);
 
   // AppCacheStorage::Delegate methods
   void OnMainResponseFound(const GURL& url,
                            const AppCacheEntry& entry,
                            const GURL& fallback_url,
                            const AppCacheEntry& fallback_entry,
                            int64_t cache_id,
                            int64_t group_id,
                            const GURL& mainfest_url) override;
 
   // Sub-resource loading -------------------------------------
   // Dedicated worker and all manner of sub-resources are handled here.
 
   std::unique_ptr<AppCacheURLRequestJob> MaybeLoadSubResource(
-      net::URLRequest* request,
       net::NetworkDelegate* network_delegate);
   void ContinueMaybeLoadSubResource();
 
   // AppCacheHost::Observer override
   void OnCacheSelectionComplete(AppCacheHost* host) override;
 
   // Data members -----------------------------------------------
 
   // What host we're servicing a request for.
   AppCacheHost* host_;
@@ skipping 44 matching lines @@
   int old_host_id_;
 
   // Cached information about the response being currently served by the
   // AppCache, if there is one.
   int cache_id_;
   GURL manifest_url_;
 
   // Backptr to the central service object.
   AppCacheServiceImpl* service_;
 
+  std::unique_ptr<AppCacheRequest> request_;

[michaeln, 2017/05/01 20:53:58]

i was wondering how object ownership was arranged, to make this more clear, can
you used std::unique_ptr<> when passing it to the AppCacheRequestHandler ctor
(and std::move it around as needed).

+
   friend class content::AppCacheRequestHandlerTest;
   DISALLOW_COPY_AND_ASSIGN(AppCacheRequestHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_REQUEST_HANDLER_H_