Reduce/Remove URLRequest dependencies from AppCacheRequestHandler

content/browser/appcache/appcache_host.cc

Index: content/browser/appcache/appcache_host.cc
diff --git a/content/browser/appcache/appcache_host.cc b/content/browser/appcache/appcache_host.cc
index 1c62678aa4d854577f0b0f476712617552c29361..7863be0f68c27056a74cdb3f9e64b52417010ce2 100644
--- a/content/browser/appcache/appcache_host.cc
+++ b/content/browser/appcache/appcache_host.cc
@@ -11,6 +11,7 @@
 #include "content/browser/appcache/appcache.h"
 #include "content/browser/appcache/appcache_backend_impl.h"
 #include "content/browser/appcache/appcache_policy.h"
+#include "content/browser/appcache/appcache_request.h"
 #include "content/browser/appcache/appcache_request_handler.h"
 #include "net/url_request/url_request.h"
 #include "storage/browser/quota/quota_manager_proxy.h"
@@ -312,7 +313,7 @@ AppCacheHost* AppCacheHost::GetParentAppCacheHost() const {
 }
 
 std::unique_ptr<AppCacheRequestHandler> AppCacheHost::CreateRequestHandler(
-    net::URLRequest* request,
+    AppCacheRequest* request,
     ResourceType resource_type,
     bool should_reset_appcache) {
   if (is_for_dedicated_worker()) {
@@ -326,15 +327,15 @@ std::unique_ptr<AppCacheRequestHandler> AppCacheHost::CreateRequestHandler(
   if (AppCacheRequestHandler::IsMainResourceType(resource_type)) {
     // Store the first party origin so that it can be used later in SelectCache
     // for checking whether the creation of the appcache is allowed.
-    first_party_url_ = request->first_party_for_cookies();
-    return base::WrapUnique(
-        new AppCacheRequestHandler(this, resource_type, should_reset_appcache));
+    first_party_url_ = request->GetFirstPartyForCookies();
+    return base::WrapUnique(new AppCacheRequestHandler(
+        this, resource_type, should_reset_appcache, request));
   }
 
   if ((associated_cache() && associated_cache()->is_complete()) ||
       is_selection_pending()) {
-    return base::WrapUnique(
-        new AppCacheRequestHandler(this, resource_type, should_reset_appcache));
+    return base::WrapUnique(new AppCacheRequestHandler(
+        this, resource_type, should_reset_appcache, request));
   }
   return NULL;
 }