Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc |
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc |
index 2e445d3c10549332356077beccfc028f46e6774d..2cbe85677af632491e19149c9e75894ecfbe7241 100644 |
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc |
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc |
@@ -19,7 +19,7 @@ |
#include "chrome/browser/instant/instant_loader.h" |
#include "chrome/browser/net/load_timing_observer.h" |
#include "chrome/browser/prerender/prerender_manager.h" |
-#include "chrome/browser/prerender/prerender_tracker.h" |
+#include "chrome/browser/prerender/prerender_render_view_tracker.h" |
#include "chrome/browser/profiles/profile_io_data.h" |
#include "chrome/browser/renderer_host/chrome_url_request_user_data.h" |
#include "chrome/browser/renderer_host/safe_browsing_resource_throttle.h" |
@@ -71,11 +71,11 @@ void NotifyDownloadInitiatedOnUI(int render_process_id, int render_view_id) { |
} // end namespace |
ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate( |
- prerender::PrerenderTracker* prerender_tracker) |
+ prerender::PrerenderRenderViewTracker* prerender_render_view_tracker) |
: download_request_limiter_(g_browser_process->download_request_limiter()), |
safe_browsing_(g_browser_process->safe_browsing_service()), |
user_script_listener_(new UserScriptListener()), |
- prerender_tracker_(prerender_tracker), |
+ prerender_render_view_tracker_(prerender_render_view_tracker), |
variation_ids_cache_initialized_(false) { |
} |
@@ -105,9 +105,10 @@ bool ChromeResourceDispatcherHostDelegate::ShouldBeginRequest( |
} |
// Abort any prerenders that spawn requests that use invalid HTTP methods. |
- if (prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id) && |
+ if (prerender_render_view_tracker_->IsPrerenderingOnIOThread(child_id, |
+ route_id) && |
!prerender::PrerenderManager::IsValidHttpMethod(method)) { |
- prerender_tracker_->TryCancelOnIOThread( |
+ prerender_render_view_tracker_->TryCancelOnIOThread( |
child_id, route_id, prerender::FINAL_STATUS_INVALID_HTTP_METHOD); |
return false; |
} |
@@ -128,7 +129,8 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning( |
ChromeURLRequestUserData* user_data = |
ChromeURLRequestUserData::Create(request); |
- if (prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id)) { |
+ if (prerender_render_view_tracker_->IsPrerenderingOnIOThread(child_id, |
+ route_id)) { |
user_data->set_is_prerender(true); |
request->set_priority(net::IDLE); |
} |
@@ -195,7 +197,7 @@ bool ChromeResourceDispatcherHostDelegate::AcceptSSLClientCertificateRequest( |
int child_id, route_id; |
if (ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView( |
&child_id, &route_id)) { |
- if (prerender_tracker_->TryCancel( |
+ if (prerender_render_view_tracker_->TryCancel( |
child_id, route_id, |
prerender::FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED)) { |
return false; |
@@ -220,7 +222,7 @@ bool ChromeResourceDispatcherHostDelegate::AcceptAuthRequest( |
return true; |
} |
- if (!prerender_tracker_->TryCancelOnIOThread( |
+ if (!prerender_render_view_tracker_->TryCancelOnIOThread( |
child_id, route_id, prerender::FINAL_STATUS_AUTH_NEEDED)) { |
return true; |
} |