| Index: content/browser/loader/async_revalidation_manager.cc
|
| diff --git a/content/browser/loader/async_revalidation_manager.cc b/content/browser/loader/async_revalidation_manager.cc
|
| index abdf659fd228059833fa8c422dedf0099ee207a0..d441b38851461adb6356cdbd833ee06391764df9 100644
|
| --- a/content/browser/loader/async_revalidation_manager.cc
|
| +++ b/content/browser/loader/async_revalidation_manager.cc
|
| @@ -9,7 +9,6 @@
|
|
|
| #include "base/logging.h"
|
| #include "content/browser/loader/async_revalidation_driver.h"
|
| -#include "content/browser/loader/resource_message_filter.h"
|
| #include "content/browser/loader/resource_request_info_impl.h"
|
| #include "content/browser/loader/resource_scheduler.h"
|
| #include "content/common/resource_messages.h"
|
| @@ -52,13 +51,14 @@ AsyncRevalidationManager::~AsyncRevalidationManager() {
|
| }
|
|
|
| void AsyncRevalidationManager::BeginAsyncRevalidation(
|
| - const net::URLRequest& for_request,
|
| + net::URLRequest& for_request,
|
| ResourceScheduler* scheduler) {
|
| DCHECK_EQ(for_request.url_chain().size(), 1u);
|
| - const ResourceRequestInfoImpl* info =
|
| + ResourceRequestInfoImpl* info =
|
| ResourceRequestInfoImpl::ForRequest(&for_request);
|
| DCHECK(info);
|
| - if (!info->filter()) {
|
| + DCHECK(info->requester_info().IsRenderer());
|
| + if (!info->requester_info().filter()) {
|
| // The child has gone away and we can no longer get ResourceContext and
|
| // URLRequestContext to perform async revalidation.
|
| // This can happen in the following cases, ordered from bad to not-so-bad
|
| @@ -89,8 +89,8 @@ void AsyncRevalidationManager::BeginAsyncRevalidation(
|
|
|
| // The embedder of //content needs to ensure that the URLRequestContext object
|
| // remains valid until after the ResourceContext object is destroyed.
|
| - info->filter()->GetContexts(info->GetResourceType(), &resource_context,
|
| - &request_context);
|
| + info->requester_info().GetContexts(info->GetResourceType(), &resource_context,
|
| + &request_context);
|
|
|
| AsyncRevalidationKey async_revalidation_key(
|
| resource_context, request_context->http_transaction_factory()->GetCache(),
|
|
|