Reduce/Remove URLRequest dependencies from AppCacheRequestHandler

content/browser/appcache/appcache_host.cc

 // 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.
 
 #include "content/browser/appcache/appcache_host.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #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"
 
 namespace content {
 
 namespace {
 
 void FillCacheInfo(const AppCache* cache,
                    const GURL& manifest_url,
@@ skipping 281 matching lines @@
   return backend ? backend->GetHost(spawning_host_id_) : NULL;
 }
 
 AppCacheHost* AppCacheHost::GetParentAppCacheHost() const {
   DCHECK(is_for_dedicated_worker());
   AppCacheBackendImpl* backend = service_->GetBackend(parent_process_id_);
   return backend ? backend->GetHost(parent_host_id_) : NULL;
 }
 
 std::unique_ptr<AppCacheRequestHandler> AppCacheHost::CreateRequestHandler(
-    net::URLRequest* request,
+    AppCacheRequest* request,
     ResourceType resource_type,
     bool should_reset_appcache) {
   if (is_for_dedicated_worker()) {
     AppCacheHost* parent_host = GetParentAppCacheHost();
     if (parent_host)
       return parent_host->CreateRequestHandler(
           request, resource_type, should_reset_appcache);
     return NULL;
   }
 
   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;
 }
 
 void AppCacheHost::GetResourceList(
     AppCacheResourceInfoVector* resource_infos) {
   if (associated_cache_.get() && associated_cache_->is_complete())
     associated_cache_->ToResourceInfoVector(resource_infos);
 }
 
@@ skipping 222 matching lines @@
   associated_cache_info_pending_ = cache && !cache->is_complete();
   AppCacheInfo info;
   if (cache)
     cache->AssociateHost(this);
 
   FillCacheInfo(cache, manifest_url, GetStatus(), &info);
   frontend_->OnCacheSelected(host_id_, info);
 }
 
 }  // namespace content