Reduce/Remove URLRequest dependencies from AppCacheRequestHandler

content/browser/appcache/appcache_request_handler.h

Index: content/browser/appcache/appcache_request_handler.h
diff --git a/content/browser/appcache/appcache_request_handler.h b/content/browser/appcache/appcache_request_handler.h
index 70d82936e1e8e0ca334c2d60f159bfbb26132fef..0d4673bfd35141d5eecbb5fd73bf07b5ddb7b8b5 100644
--- a/content/browser/appcache/appcache_request_handler.h
+++ b/content/browser/appcache/appcache_request_handler.h
@@ -25,6 +25,7 @@ class URLRequest;
 }  // namespace net
 
 namespace content {
+class AppCacheRequest;
 class AppCacheRequestHandlerTest;
 class AppCacheURLRequestJob;
 
@@ -43,14 +44,11 @@ class CONTENT_EXPORT AppCacheRequestHandler
 
   // 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);
@@ -75,8 +73,10 @@ class CONTENT_EXPORT AppCacheRequestHandler
   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;
@@ -101,7 +101,6 @@ class CONTENT_EXPORT AppCacheRequestHandler
   // 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.
@@ -115,7 +114,6 @@ class CONTENT_EXPORT AppCacheRequestHandler
   // Frame and SharedWorker main resources are handled here.
 
   std::unique_ptr<AppCacheURLRequestJob> MaybeLoadMainResource(
-      net::URLRequest* request,
       net::NetworkDelegate* network_delegate);
 
   // AppCacheStorage::Delegate methods
@@ -131,7 +129,6 @@ class CONTENT_EXPORT AppCacheRequestHandler
   // 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();
 
@@ -196,6 +193,8 @@ class CONTENT_EXPORT AppCacheRequestHandler
   // 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);
 };